Skip to content

Commit

Permalink
Move Cue under Saturn_lockfree
Browse files Browse the repository at this point in the history
  • Loading branch information
polytypic committed Jan 13, 2024
1 parent 5ad6709 commit 12a77c7
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 10 deletions.
3 changes: 1 addition & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions saturn.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions saturn_lockfree.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 1 addition & 3 deletions src/dune
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
(name saturn)
(public_name saturn)
(libraries
(re_export saturn_lockfree)
domain-local-await
backoff))
(re_export saturn_lockfree)))
2 changes: 1 addition & 1 deletion src/saturn.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/saturn.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src_lockfree/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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
^ {| ))

Expand Down
1 change: 1 addition & 0 deletions src_lockfree/saturn_lockfree.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src_lockfree/saturn_lockfree.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/cue/dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(test
(package saturn_lockfree)
(name stm_cue)
(modules stm_cue)
(libraries
Expand Down

0 comments on commit 12a77c7

Please sign in to comment.