Move Cue under Saturn_lockfree

ocaml-multicore · Jan 13, 2024 · 12a77c7 · 12a77c7
1 parent 5ad6709
commit 12a77c7
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 10 deletions.
diff --git a/dune-project b/dune-project
@@ -13,8 +13,6 @@
  (depends
   (ocaml (>= 4.13))
   (domain_shims (and (>= 0.1.0) :with-test))
-  (domain-local-await (>= 1.0.0))
-  (backoff (>= 0.1.0))
   (saturn_lockfree (= :version))
   (multicore-magic (and (>= 2.1.0) :with-test))
   (alcotest (and (>= 1.7.0) :with-test))
@@ -28,6 +26,7 @@
  (synopsis "Collection of lock-free data structures for Multicore OCaml")
  (depends
   (ocaml (>= 4.13))
+  (domain-local-await (>= 1.0.0))
   (domain_shims (and (>= 0.1.0) :with-test))
   (backoff (>= 0.1.0))
   (multicore-magic (>= 2.1.0))

diff --git a/saturn.opam b/saturn.opam
@@ -12,8 +12,6 @@ depends: [
   "dune" {>= "3.2"}
   "ocaml" {>= "4.13"}
   "domain_shims" {>= "0.1.0" & with-test}
-  "domain-local-await" {>= "1.0.0"}
-  "backoff" {>= "0.1.0"}
   "saturn_lockfree" {= version}
   "multicore-magic" {>= "2.1.0" & with-test}
   "alcotest" {>= "1.7.0" & with-test}

diff --git a/saturn_lockfree.opam b/saturn_lockfree.opam
@@ -10,6 +10,7 @@ bug-reports: "https://github.com/ocaml-multicore/saturn/issues"
 depends: [
   "dune" {>= "3.2"}
   "ocaml" {>= "4.13"}
+  "domain-local-await" {>= "1.0.0"}
   "domain_shims" {>= "0.1.0" & with-test}
   "backoff" {>= "0.1.0"}
   "multicore-magic" {>= "2.1.0"}

diff --git a/src/dune b/src/dune
@@ -2,6 +2,4 @@
  (name saturn)
  (public_name saturn)
  (libraries
-  (re_export saturn_lockfree)
-  domain-local-await
-  backoff))
+  (re_export saturn_lockfree)))
diff --git a/src/saturn.ml b/src/saturn.ml
@@ -26,7 +26,7 @@ Copyright (c) 2017, Nicolas ASSOUAD <[email protected]>
 ########
 *)
 
-module Cue = Cue
+module Cue = Saturn_lockfree.Cue
 module Queue = Saturn_lockfree.Queue
 module Stack = Saturn_lockfree.Stack
 module Work_stealing_deque = Saturn_lockfree.Work_stealing_deque

diff --git a/src/saturn.mli b/src/saturn.mli
@@ -30,7 +30,7 @@ Copyright (c) 2017, Nicolas ASSOUAD <[email protected]>
 
 (** {1 Data structures} *)
 
-module Cue = Cue
+module Cue = Saturn_lockfree.Cue
 module Queue = Saturn_lockfree.Queue
 module Stack = Saturn_lockfree.Stack
 module Work_stealing_deque = Saturn_lockfree.Work_stealing_deque

diff --git a/src/cue.ml → src_lockfree/cue.ml b/src/cue.ml → src_lockfree/cue.ml
diff --git a/src/cue.mli → src_lockfree/cue.mli b/src/cue.mli → src_lockfree/cue.mli
diff --git a/src_lockfree/dune b/src_lockfree/dune
@@ -10,7 +10,7 @@ let () =
 (library
  (name saturn_lockfree)
  (public_name saturn_lockfree)
- (libraries backoff multicore-magic |}
+ (libraries backoff multicore-magic domain-local-await |}
   ^ maybe_threads
   ^ {| ))
 

diff --git a/src_lockfree/saturn_lockfree.ml b/src_lockfree/saturn_lockfree.ml
@@ -26,6 +26,7 @@ Copyright (c) 2017, Nicolas ASSOUAD <[email protected]>
 ########
 *)
 
+module Cue = Cue
 module Queue = Michael_scott_queue
 module Stack = Treiber_stack
 module Work_stealing_deque = Ws_deque

diff --git a/src_lockfree/saturn_lockfree.mli b/src_lockfree/saturn_lockfree.mli
@@ -30,6 +30,7 @@ Copyright (c) 2017, Nicolas ASSOUAD <[email protected]>
 
 (** {1 Data structures} *)
 
+module Cue = Cue
 module Queue = Michael_scott_queue
 module Stack = Treiber_stack
 module Work_stealing_deque = Ws_deque

diff --git a/test/cue/dune b/test/cue/dune
@@ -1,4 +1,5 @@
 (test
+ (package saturn_lockfree)
  (name stm_cue)
  (modules stm_cue)
  (libraries