Make domainslib build/run with OCaml 5.00 after PR #704

.github/workflows/main.yml

@@ -41,7 +41,7 @@ jobs:
             default: https://github.com/ocaml/opam-repository.git
           cache-prefix: ${{ steps.multicore_hash.outputs.commit }}
 
-      - run: opam install . --deps-only
+      - run: opam install . --deps-only --with-test
 
       - run: opam exec -- make all
 

domainslib.opam

@@ -12,6 +12,7 @@ depends: [
   "base-domains"
   "ocamlfind" {build}
   "dune" {build}
+  "mirage-clock-unix" {with-test}
 ]
 depopts: []
 build: [

lib/multi_channel.ml

@@ -149,7 +149,7 @@ let rec recv_poll_repeated mchan dls repeats =
     | Exit ->
       if repeats = 1 then raise Exit
       else begin
-        Domain.Sync.cpu_relax ();
+        Domain.cpu_relax ();
         recv_poll_repeated mchan dls (repeats - 1)
       end
 

lib/task.ml

@@ -75,7 +75,7 @@ let rec await pool promise =
           | Task (t, p) -> do_task t p
           | Quit -> raise TasksActive
         with
-        | Exit -> Domain.Sync.cpu_relax ()
+        | Exit -> Domain.cpu_relax ()
       end;
       await pool promise
   | Some (Ok v) -> v

lib/ws_deque.ml

@@ -189,7 +189,7 @@ module M : S = struct
       if Atomic.compare_and_set q.top t (t + 1) then
         release out
       else begin
-        Domain.Sync.cpu_relax ();
+        Domain.cpu_relax ();
         steal q
       end
 

test/dune

@@ -59,7 +59,7 @@
 
 (test
  (name task_throughput)
- (libraries domainslib)
+ (libraries domainslib mirage-clock-unix)
  (modules task_throughput)
  (modes native))
 

test/task_throughput.ml

@@ -54,9 +54,9 @@ let _ =
 
   let hist = TimingHist.make 5 25 in
   for _ = 1 to n_iterations do
-    let t0 = Domain.timer_ticks () in
+    let t0 = Mclock.elapsed_ns() in
     T.parallel_for pool ~start:1 ~finish:n_tasks ~body:(fun _ -> ());
-    let t = Int64.sub (Domain.timer_ticks ()) t0 in
+    let t = Int64.sub (Mclock.elapsed_ns ()) t0 in
     TimingHist.add_point hist (Int64.to_int t);
   done;