Merge master into feature/config-ntp-timezone-maxcstate (#6705)

Author: changlei-li

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.15)
+(lang dune 3.20)
 
 (formatting
  (enabled_for ocaml))

ocaml/database/dune

@@ -51,6 +51,7 @@
   threads.posix
   http_lib
   httpsvr
+  unix
   uuid
   xapi-backtrace
   xapi-datamodel
@@ -78,6 +79,7 @@
  (name block_device_io)
  (modules block_device_io)
  (libraries
+  unix
   xapi_database
   xapi-log
   xapi-stdext-pervasives
@@ -98,6 +100,7 @@
   http_lib
   httpsvr
   threads.posix
+  unix
   xapi_database
   xapi-stdext-threads
   xapi-stdext-unix))
@@ -113,6 +116,7 @@
   rpclib.xml
   sexplib
   sexplib0
+  unix
   xapi_database
   xml-light2))
 

ocaml/database/stats.ml

@@ -68,8 +68,12 @@ let sd (p : Normal_population.t) =
   in
   sqrt v
 
-let string_of (p : Normal_population.t) =
-  Printf.sprintf "%f [sd = %f]" (mean p) (sd p)
+let string_of ?(counts = false) (p : Normal_population.t) =
+  match counts with
+  | false ->
+      Printf.sprintf "%f [sd = %f]" (mean p) (sd p)
+  | true ->
+      Printf.sprintf "%f [sd = %f, n=%d]" (mean p) (sd p) p.n
 
 (** [sample thing t] records new time [t] for population named [thing] *)
 let sample (name : string) (x : float) : unit =
@@ -104,7 +108,7 @@ let time_this (name : string) f =
           name
   )
 
-let summarise () =
+let summarise ?(counts = false) () =
   with_lock timings_m (fun () ->
-      Hashtbl.fold (fun k v acc -> (k, string_of v) :: acc) timings []
+      Hashtbl.fold (fun k v acc -> (k, string_of ~counts v) :: acc) timings []
   )

ocaml/database/stats.mli

@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *)
 
-val summarise : unit -> (string * string) list
+val summarise : ?counts:bool -> unit -> (string * string) list
 (** Produce a string name -> string mean, standard deviation summary for each population *)
 
 val time_this : string -> (unit -> 'a) -> 'a

ocaml/doc/dune

@@ -5,6 +5,7 @@
     mustache
     rpclib.core
     rpclib.json
+    unix
     uuid
     xapi-consts
     xapi-datamodel

ocaml/forkexecd/cli/dune

@@ -1,7 +1,7 @@
 (executable
  (modes exe)
  (name fe_cli)
- (libraries forkexec))
+ (libraries forkexec unix))
 
 (install
  (package xapi-forkexecd)

ocaml/forkexecd/lib/dune

@@ -10,6 +10,7 @@
    rpclib.core
    rpclib.json
    rpclib.xml
+   unix
    uuid
    xapi-backtrace
    xapi-log

ocaml/forkexecd/src/dune

@@ -5,6 +5,7 @@
    astring
    fd-send-recv
    forkexec
+   unix
    uuid
    xapi-log
    xapi-stdext-unix

ocaml/forkexecd/test/dune

@@ -1,7 +1,7 @@
 (executable
  (modes exe)
  (name fe_test)
- (libraries fmt forkexec mtime clock mtime.clock.os uuid xapi-stdext-unix fd-send-recv xapi-log))
+ (libraries fmt forkexec mtime clock mtime.clock.os str uuid xapi-stdext-unix fd-send-recv xapi-log unix))
 
 ; preload library to redirect "/dev/log"
 (rule

ocaml/gencert/dune

@@ -16,6 +16,7 @@
     ptime.clock.os
     result
     rresult
+    unix
     x509
     xapi-backtrace
     xapi-consts
@@ -32,6 +33,7 @@
   (libraries
     astring
     gencertlib
+    unix
     x509
     xapi-inventory
     xapi_aux