[Master to feature] Merge master to feature branch

dune-project

@@ -235,7 +235,6 @@
   fmt
   logs
   mtime
-  xapi-backtrace
   (xapi-stdext-pervasives (= :version))))
 
 (package
@@ -322,7 +321,6 @@
   uuidm
   uutf
   x509
-  xapi-backtrace
   xapi-log
   xapi-types
   xapi-stdext-pervasives
@@ -451,7 +449,6 @@
   uutf
   uuidm
   x509
-  xapi-backtrace
   (xapi-client
    (= :version))
   (xapi-cli-protocol
@@ -764,7 +761,6 @@
   uri
   (uuid
    (= :version))
-  xapi-backtrace
   (xapi-idl
    (= :version))
   (xapi-log
@@ -795,7 +791,6 @@
   rpclib
   (uuid
    (= :version))
-  xapi-backtrace
   (xapi-log
    (= :version))
   (xapi-stdext-pervasives
@@ -842,7 +837,7 @@
    (>= 4.08))
   logs
   (odoc :with-doc)
-  xapi-backtrace))
+  ))
 
 (package
  (name xapi-stdext-std)
@@ -902,7 +897,6 @@
     (>= 0.21.2)
     :with-test))
   (odoc :with-doc)
-  xapi-backtrace
   unix-errno
   (xapi-stdext-pervasives
    (= :version))

ocaml/database/dune

@@ -53,7 +53,7 @@
   httpsvr
   unix
   uuid
-  xapi-backtrace
+  backtrace
   xapi-datamodel
   xapi-log
   (re_export xapi-schema)

ocaml/forkexecd/lib/dune

@@ -12,7 +12,7 @@
    rpclib.xml
    unix
    uuid
-   xapi-backtrace
+   backtrace
    xapi-log
    xapi-stdext-pervasives
    xapi-stdext-unix

ocaml/forkexecd/lib/fe_stubs.c

@@ -20,6 +20,8 @@
 #include <limits.h>
 #include <sys/wait.h>
 
+#include <caml/mlvalues.h>
+#include <caml/threads.h>
 #include <caml/fail.h>
 #include <caml/memory.h>
 #include <caml/unixsupport.h>
@@ -213,15 +215,15 @@ caml_safe_exec_with_helper(value args, value environment)
     }
 
     // potentially slow section, release Ocaml engine
-    caml_enter_blocking_section();
+    caml_release_runtime_system();
 
     safe_exec_result res;
     int err = safe_exec_with_helper(&res, c_args, c_envs);
 
     free(c_envs);
     free(c_args);
 
-    caml_leave_blocking_section();
+    caml_acquire_runtime_system();
 
     // error, notify with an exception
     if (err != 0)
@@ -395,7 +397,7 @@ caml_pidwaiter_waitpid(value timeout_value, value pid_value)
     double timeout = timeout_value == Val_none ? 0 : Double_val(Some_val(timeout_value));
     pid_t pid = Int_val(pid_value);
 
-    caml_enter_blocking_section();
+    caml_release_runtime_system();
 
     bool timed_out = false;
     int err = 0;
@@ -407,7 +409,7 @@ caml_pidwaiter_waitpid(value timeout_value, value pid_value)
             timed_out = true;
     }
 
-    caml_leave_blocking_section();
+    caml_acquire_runtime_system();
 
     if (err)
         unix_error(err, "waitpid", Nothing);

ocaml/gencert/dune

@@ -18,7 +18,7 @@
     rresult
     unix
     x509
-    xapi-backtrace
+    backtrace
     xapi-consts
     xapi-log
     xapi-inventory

ocaml/idl/datamodel_lifecycle.ml

@@ -234,7 +234,7 @@ let prototyped_of_message = function
   | "PCI", "disable_dom0_access" ->
       Some "24.14.0"
   | "message", "destroy_all" ->
-      Some "26.5.0-next"
+      Some "26.6.0"
   | "message", "destroy_many" ->
       Some "22.19.0"
   | "VTPM", "set_contents" ->

ocaml/idl/dune

@@ -13,7 +13,7 @@
     sexplib0
     sexpr
     threads
-    xapi-backtrace
+    backtrace
     xapi-consts
     xapi-schema
     clock

ocaml/idl/ocaml_backend/dune

@@ -4,6 +4,8 @@
   (libraries
     astring
     cmdliner
+    fmt
+    ptime.clock
     uuidm
     xapi-consts
     xapi-datamodel

ocaml/idl/ocaml_backend/gen_client.ml

@@ -319,6 +319,12 @@ let gen_module api : O.Module.t =
     ; "    | Rpc.Enum ((Rpc.String code) :: args) -> return (server_failure \
        code (List.map Rpc.string_of_rpc args))"
     ; "    | rpc -> failwith (\"Client.rpc: \" ^ Rpc.to_string rpc)"
+    ; "type client = {rpc: Rpc.call -> Rpc.response; session_id:  ref_session}"
+    ; "type 'a api = rpc:(Rpc.call -> Rpc.response) -> session_id:ref_session \
+       -> 'a"
+    ; ""
+    ; "let call {rpc; session_id} f = f ~rpc ~session_id"
+    ; ""
     ]
   in
   let postamble =

ocaml/idl/ocaml_backend/gen_rbac.ml

@@ -34,10 +34,13 @@ let internal_role_local_root = "_local_root_"
 
 (* the output of this function is used as input by the automatic tests *)
 let writer_csv static_permissions_roles =
-  Printf.sprintf "%s,PERMISSION/ROLE,%s\n"
-    (let t = Debug.gettimestring () in
-     String.sub t 0 (String.length t - 1)
-    )
+  let now =
+    let now = Ptime_clock.now () in
+    let str = Fmt.str "%a" Ptime.(pp_rfc3339 ~frac_s:3 ~tz_offset_s:0 ()) now in
+    (* remove separators between Year, Month, and Day; to keep old logging format *)
+    Astring.String.filter (function '-' -> false | _ -> true) str
+  in
+  Printf.sprintf "%s,PERMISSION/ROLE,%s\n" now
     (* role titles are ordered by roles in roles_all *)
     (List.fold_left (fun rr r -> rr ^ r ^ ",") "" Datamodel_roles.roles_all)
   ^ List.fold_left

ocaml/libs/backtrace/.gitignore

@@ -0,0 +1,3 @@
+_build
+*.install
+.merlin

ocaml/libs/backtrace/CHANGES.md

@@ -0,0 +1,26 @@
+## v0.8 (13-Mar-2026)
+* Set a license
+* Provide a new with_backtraces that prevents printing invalid traces
+* Fix losing backtraces when reraising
+* Add regression tests
+
+## v0.7 (18-Sep-2018)
+* Remove dependency on full sexplib
+* Simplify jbuild, quiet warnings, move to dune and update opam dependencies
+* jbuild: remove ppx_deriving_rpc from libraries
+* Move to dune and update opam dependencies
+
+## v0.6 (16-May-2018)
+* Add support for ppx_sexp_conv >= v0.11.0
+
+## v0.5 (04-Aug-2017)
+* port to jbuilder
+
+## v0.3 (21-Aug-2015)
+* correct ordering
+* add rpc to opam
+* add doc gen to _oasis
+
+## v0.2 (20-Nov-2014)
+* store backtraces as lists of records rather than strings
+* change the API for "importing" backtraces from other languages