Merge pull request #70 from ocaml-multicore/lockfree

remove Ws_deque module
ocaml-multicore · Apr 8, 2022 · b8de1f7 · b8de1f7
2 parents b8781bc + ae5b38b
commit b8de1f7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 199 deletions.
diff --git a/domainslib.opam b/domainslib.opam
@@ -10,7 +10,8 @@ bug-reports: "https://github.com/ocaml-multicore/domainslib/issues"
 tags: []
 depends: [
   "ocaml" {>= "5.00"}
-  "dune" {>= "1.8"}
+  "dune" {>= "3.0"}
+  "lockfree" { >= "0.2.0"}
   "mirage-clock-unix" {with-test}
 ]
 depopts: []

diff --git a/lib/dune b/lib/dune
@@ -1,3 +1,4 @@
 (library
  (name domainslib)
- (public_name domainslib))
+ (public_name domainslib)
+ (libraries lockfree))
diff --git a/lib/multi_channel.ml b/lib/multi_channel.ml
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-module Ws_deque = Ws_deque.M
+module Ws_deque = Lockfree.Ws_deque.M
 
 type mutex_condvar = {
   mutex: Mutex.t;

diff --git a/lib/ws_deque.ml b/lib/ws_deque.ml