Update feature/perf from master

configure.ml

@@ -84,11 +84,12 @@ let () =
   in
   List.iter print_endline lines ;
   (* Expand @LIBEXEC@ in udev rules *)
-  try
-    let xenopsd_libexecdir = Hashtbl.find config "XENOPSD_LIBEXECDIR" in
-    expand "@LIBEXEC@" xenopsd_libexecdir "ocaml/xenopsd/scripts/vif.in"
-      "ocaml/xenopsd/scripts/vif" ;
-    expand "@LIBEXEC@" xenopsd_libexecdir
-      "ocaml/xenopsd/scripts/xen-backend.rules.in"
-      "ocaml/xenopsd/scripts/xen-backend.rules"
-  with Not_found -> failwith "xenopsd_libexecdir not set"
+  match Hashtbl.find_opt config "XENOPSD_LIBEXECDIR" with
+  | Some xenopsd_libexecdir ->
+      expand "@LIBEXEC@" xenopsd_libexecdir "ocaml/xenopsd/scripts/vif.in"
+        "ocaml/xenopsd/scripts/vif" ;
+      expand "@LIBEXEC@" xenopsd_libexecdir
+        "ocaml/xenopsd/scripts/xen-backend.rules.in"
+        "ocaml/xenopsd/scripts/xen-backend.rules"
+  | None ->
+      failwith "xenopsd_libexecdir not set"

dune-project

@@ -227,6 +227,27 @@
 
 (package
   (name xapi-networkd)
+  (authors "Jon Ludlam")
+  (synopsis "The XCP networking daemon")
+  (depends
+    (alcotest :with-test)
+    astring
+    base-threads
+    (forkexec (= :version))
+    (http-lib (= :version))
+    mtime
+    netlink
+    re
+    rpclib
+    (xapi-idl (= :version))
+    xapi-inventory
+    (xapi-stdext-pervasives (= :version))
+    (xapi-stdext-std (= :version))
+    (xapi-stdext-threads (= :version))
+    (xapi-stdext-unix (= :version))
+    xapi-test-utils
+    (xen-api-client (= :version))
+  )
 )
 
 (package
@@ -243,6 +264,14 @@
 
 (package
   (name xapi-forkexecd)
+  (synopsis "Sub-process control service for xapi")
+  (description "This daemon creates and manages sub-processes on behalf of xapi.")
+  (depends
+   astring
+   (forkexec (= :version))
+   (uuid (= :version))
+   (xapi-stdext-unix (= :version))
+  )
 )
 
 (package
@@ -446,6 +475,19 @@ This package provides an Lwt compatible interface to the library.")
 
 (package
   (name forkexec)
+  (synopsis "Process-spawning library")
+  (description "Client and server library to spawn processes.")
+  (depends
+    base-threads
+    (fd-send-recv (>= "2.0.0"))
+    ppx_deriving_rpc
+    rpclib
+    (uuid (= :version))
+    (xapi-log (= :version))
+    (xapi-stdext-pervasives (= :version))
+    (xapi-stdext-unix (= :version))
+    (xapi-tracing (= :version))
+  )
 )
 
 (package
@@ -515,7 +557,6 @@ This package provides an Lwt compatible interface to the library.")
   (synopsis "Xapi's standard library extension, Threads")
   (authors "Jonathan Ludlam")
   (depends
-    ocaml
     base-threads
     base-unix
     (odoc :with-doc)
@@ -552,7 +593,6 @@ This package provides an Lwt compatible interface to the library.")
   (synopsis "Xapi's standard library extension, Zerocheck")
   (authors "Jonathan Ludlam")
   (depends
-    ocaml
     (odoc :with-doc)
   )
 )

forkexec.opam

@@ -1,31 +1,37 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "[email protected]"
-homepage: "https://github.com/xapi-project/"
+synopsis: "Process-spawning library"
+description: "Client and server library to spawn processes."
+maintainer: ["Xapi project maintainers"]
+authors: ["[email protected]"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [ "org:xapi-project" ]
-
-build: [[ "dune" "build" "-p" name "-j" jobs ]]
-
 depends: [
-  "ocaml"
-  "dune"
+  "dune" {>= "3.0"}
   "base-threads"
-  "fd-send-recv"
+  "fd-send-recv" {>= "2.0.0"}
   "ppx_deriving_rpc"
   "rpclib"
-  "uuid"
-  "xapi-log"
-  "xapi-stdext-pervasives"
-  "xapi-stdext-unix"
-  "xapi-tracing"
+  "uuid" {= version}
+  "xapi-log" {= version}
+  "xapi-stdext-pervasives" {= version}
+  "xapi-stdext-unix" {= version}
+  "xapi-tracing" {= version}
+  "odoc" {with-doc}
 ]
-synopsis: "Sub-process control service for xapi"
-description:
-  "This daemon creates and manages sub-processes on behalf of xapi."
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"

ocaml/database/db_backend.ml

@@ -104,8 +104,5 @@ let is_session_registered session =
 
 let get_registered_database session =
   with_lock db_registration_mutex (fun () ->
-      if Hashtbl.mem foreign_databases session then
-        Some (Hashtbl.find foreign_databases session)
-      else
-        None
+      Hashtbl.find_opt foreign_databases session
   )

ocaml/database/db_conn_store.ml

@@ -41,12 +41,14 @@ let read_db_connections () = !db_connections
 let with_db_conn_lock db_conn f =
   let db_conn_m =
     with_lock db_conn_locks_m (fun () ->
-        try Hashtbl.find db_conn_locks db_conn
-        with _ ->
-          (* If we don't have a lock already for this connection then go make one dynamically and use that from then on *)
-          let new_dbconn_mutex = Mutex.create () in
-          Hashtbl.replace db_conn_locks db_conn new_dbconn_mutex ;
-          new_dbconn_mutex
+        match Hashtbl.find_opt db_conn_locks db_conn with
+        | Some x ->
+            x
+        | None ->
+            (* If we don't have a lock already for this connection then go make one dynamically and use that from then on *)
+            let new_dbconn_mutex = Mutex.create () in
+            Hashtbl.replace db_conn_locks db_conn new_dbconn_mutex ;
+            new_dbconn_mutex
     )
   in
   with_lock db_conn_m (fun () -> f ())

ocaml/database/stats.ml

@@ -77,10 +77,9 @@ let sample (name : string) (x : float) : unit =
   let x' = log x in
   with_lock timings_m (fun () ->
       let p =
-        if Hashtbl.mem timings name then
-          Hashtbl.find timings name
-        else
-          Normal_population.empty
+        Option.value
+          (Hashtbl.find_opt timings name)
+          ~default:Normal_population.empty
       in
       let p' = Normal_population.sample p x' in
       Hashtbl.replace timings name p'

ocaml/forkexecd/test/fe_test.ml

@@ -221,9 +221,10 @@ let test_internal_failure_error () =
     Forkhelpers.safe_close_and_exec None (Some fd) None [] exe args |> ignore ;
     fail "Expected an exception"
   with
-  | Fd_send_recv.Unix_error _ ->
+  | Fd_send_recv.Unix_error _ | Unix.Unix_error (Unix.EBADF, _, _) ->
       leak_fd_detect ()
   | e ->
+      Printexc.print_backtrace stderr ;
       fail "Failed with unexpected exception: %s" (Printexc.to_string e)
 
 let master fds =

ocaml/idl/datamodel_host.ml

@@ -1367,6 +1367,7 @@ let set_power_on_mode =
       [
         (Published, rel_cowley, "")
       ; (Changed, rel_stockholm, "Removed iLO script")
+      ; (Changed, "24.19.0", "Replaced DRAC mode with IPMI")
       ]
     ~in_product_since:rel_midnight_ride
     ~doc:"Set the power-on-mode, host, user and password"
@@ -1375,7 +1376,7 @@ let set_power_on_mode =
         (Ref _host, "self", "The host")
       ; ( String
         , "power_on_mode"
-        , "power-on-mode can be empty, wake-on-lan, DRAC or other"
+        , "power-on-mode can be empty, wake-on-lan, IPMI or other"
         )
       ; (Map (String, String), "power_on_config", "Power on config")
       ]

ocaml/idl/datamodel_lifecycle.ml

@@ -1,4 +1,6 @@
 let prototyped_of_class = function
+  | "VM_group" ->
+      Some "24.18.0-next"
   | "Observer" ->
       Some "23.14.0"
   | "VTPM" ->
@@ -7,6 +9,10 @@ let prototyped_of_class = function
       None
 
 let prototyped_of_field = function
+  | "VM_group", "VMs" ->
+      Some "24.18.0-next"
+  | "VM_group", "placement" ->
+      Some "24.18.0-next"
   | "Observer", "enabled" ->
       Some "23.14.0"
   | "Observer", "components" ->
@@ -55,6 +61,8 @@ let prototyped_of_field = function
       Some "22.27.0"
   | "host", "last_software_update" ->
       Some "22.20.0"
+  | "VM", "groups" ->
+      Some "24.18.0-next"
   | "VM", "pending_guidances_full" ->
       Some "24.10.0"
   | "VM", "pending_guidances_recommended" ->
@@ -63,6 +71,8 @@ let prototyped_of_field = function
       Some "23.18.0"
   | "VM", "actions__after_softreboot" ->
       Some "23.1.0"
+  | "pool", "recommendations" ->
+      Some "24.18.0-next"
   | "pool", "update_sync_enabled" ->
       Some "23.18.0"
   | "pool", "update_sync_day" ->
@@ -139,6 +149,8 @@ let prototyped_of_message = function
       Some "24.17.0"
   | "VM", "restart_device_models" ->
       Some "23.30.0"
+  | "VM", "set_groups" ->
+      Some "24.18.0-next"
   | "pool", "get_guest_secureboot_readiness" ->
       Some "24.17.0"
   | "pool", "set_ext_auth_max_threads" ->

ocaml/idl/dtd_backend.ml

@@ -41,7 +41,7 @@ let is_element = function Element (_, _, _) -> true | _ -> false
 let string_of_attribute = function
   | Attribute (n, options, default) ->
       let opt_string =
-        if List.length options = 0 then
+        if options = [] then
           "CDATA"
         else
           "(" ^ String.concat " | " options ^ ")"
@@ -59,7 +59,7 @@ let string_of_attribute = function
       sprintf "%s %s %s" n opt_string def_string
 
 let strings_of_attributes parent atts =
-  if List.length atts > 0 then
+  if atts <> [] then
     let prefix = sprintf "<!ATTLIST %s " parent in
     let body = List.map string_of_attribute atts in
     (prefix :: body) @ [">"]
@@ -110,14 +110,13 @@ let rec strings_of_dtd_element known_els = function
 
 let element known_els name children atts =
   let existing_children =
-    if Hashtbl.mem known_els name then
-      match Hashtbl.find known_els name with
-      | Element (_, c, att) ->
-          (c, att)
-      | _ ->
-          assert false
-    else
-      ([], [])
+    match Hashtbl.find_opt known_els name with
+    | Some (Element (_, c, att)) ->
+        (c, att)
+    | None ->
+        ([], [])
+    | _ ->
+        assert false
   in
   let open Xapi_stdext_std.Listext in
   let el =

ocaml/libs/ezxenstore/core/watch.ml

@@ -51,7 +51,7 @@ let wait_for ~xs ?(timeout = 300.) (x : 'a t) =
         Thread.create
           (fun () ->
             let r, _, _ = Unix.select [p1] [] [] timeout in
-            if List.length r > 0 then
+            if r <> [] then
               ()
             else
               try Xs_client_unix.Task.cancel task with _ -> ()

ocaml/libs/http-lib/buf_io.ml

@@ -80,7 +80,7 @@ let fill_buf ~buffered ic timeout =
   let buf_size = Bytes.length ic.buf in
   let fill_no_exc timeout len =
     let l, _, _ = Unix.select [ic.fd] [] [] timeout in
-    if List.length l <> 0 then (
+    if l <> [] then (
       let n = Unix.read ic.fd ic.buf ic.max len in
       ic.max <- n + ic.max ;
       if n = 0 && len <> 0 then raise Eof ;