Try harder to return an optimal index and allow slack in test

ocaml-multicore · Dec 24, 2023 · 238e204 · 238e204
1 parent dd8cde0
commit 238e204
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/index.ocaml5.ml b/src/index.ocaml5.ml
@@ -129,7 +129,7 @@ open struct
             t.on_first_get t domain
           end
           else Index_allocator.release t.index_allocator index;
-          new_index
+          instantaneous_domain_index t domain
         end
         else begin
           Index_allocator.release t.index_allocator new_index;

diff --git a/test/Multicore_magic_test.ml b/test/Multicore_magic_test.ml
@@ -107,6 +107,7 @@ let test_instantaneous_domain_index () =
     let module Atomic = Multicore_magic.Transparent_atomic in
     let stress () =
       let n_domains = 7 in
+      let slack = 1 in
       let num_started = Atomic.make 0 |> Multicore_magic.copy_as_padded in
       let num_exited = Atomic.make 0 |> Multicore_magic.copy_as_padded in
       let failed = ref false |> Multicore_magic.copy_as_padded in
@@ -115,7 +116,7 @@ let test_instantaneous_domain_index () =
         let num_exited = Atomic.get num_exited in
         let i = Multicore_magic.instantaneous_domain_index () in
         let n = Atomic.get num_started - num_exited in
-        if i < 0 || n < i then failed := true
+        if i < 0 || n + slack < i || n_domains <= i then failed := true
       in
 
       let domain () =