diff --git a/bench/bench_skiplist.ml b/bench/bench_skiplist.ml index 70cde512..285dc450 100644 --- a/bench/bench_skiplist.ml +++ b/bench/bench_skiplist.ml @@ -1,4 +1,4 @@ -open Lockfree +open Saturn let workload num_elems num_threads add remove = let sl = Skiplist.create () in diff --git a/src/saturn.ml b/src/saturn.ml index d3b71e46..5ac904f4 100644 --- a/src/saturn.ml +++ b/src/saturn.ml @@ -35,4 +35,7 @@ module Single_prod_single_cons_queue = module Single_consumer_queue = Saturn_lockfree.Single_consumer_queue module Relaxed_queue = Mpmc_relaxed_queue +module Skiplist = Saturn_lockfree.Skiplist + + module Backoff = Saturn_lockfree.Backoff diff --git a/src/saturn.mli b/src/saturn.mli index 1a9d56f5..e05f38bf 100644 --- a/src/saturn.mli +++ b/src/saturn.mli @@ -40,5 +40,7 @@ module Single_prod_single_cons_queue = module Single_consumer_queue = Saturn_lockfree.Single_consumer_queue module Relaxed_queue = Mpmc_relaxed_queue -module Backoff = Saturn_lockfree.Backoff +module Skiplist = Saturn_lockfree.Skiplist + (** {2 Other} *) +module Backoff = Saturn_lockfree.Backoff diff --git a/src_lockfree/saturn_lockfree.ml b/src_lockfree/saturn_lockfree.ml index 35795c3f..8e76bc86 100644 --- a/src_lockfree/saturn_lockfree.ml +++ b/src_lockfree/saturn_lockfree.ml @@ -32,5 +32,6 @@ module Work_stealing_deque = Ws_deque module Single_prod_single_cons_queue = Spsc_queue module Single_consumer_queue = Mpsc_queue module Relaxed_queue = Mpmc_relaxed_queue -module Backoff = Backoff module Skiplist = Skiplist + +module Backoff = Backoff diff --git a/src_lockfree/saturn_lockfree.mli b/src_lockfree/saturn_lockfree.mli index c0a59720..683eb6a9 100644 --- a/src_lockfree/saturn_lockfree.mli +++ b/src_lockfree/saturn_lockfree.mli @@ -36,8 +36,8 @@ module Work_stealing_deque = Ws_deque module Single_prod_single_cons_queue = Spsc_queue module Single_consumer_queue = Mpsc_queue module Relaxed_queue = Mpmc_relaxed_queue +module Skiplist = Skiplist (** {2 Other} *) module Backoff = Backoff -module Skiplist = Skiplist diff --git a/src/skiplist.ml b/src_lockfree/skiplist.ml similarity index 100% rename from src/skiplist.ml rename to src_lockfree/skiplist.ml diff --git a/src/skiplist.mli b/src_lockfree/skiplist.mli similarity index 100% rename from src/skiplist.mli rename to src_lockfree/skiplist.mli diff --git a/test/skiplist/dune b/test/skiplist/dune index 1a75d05f..3ffaa883 100644 --- a/test/skiplist/dune +++ b/test/skiplist/dune @@ -1,8 +1,8 @@ (rule - (copy ../../src/backoff.ml backoff.ml)) + (copy ../../src_lockfree/backoff.ml backoff.ml)) (rule - (copy ../../src/skiplist.ml skiplist.ml)) + (copy ../../src_lockfree/skiplist.ml skiplist.ml)) (test (name skiplist_dscheck) @@ -11,12 +11,12 @@ (test (name qcheck_skiplist) - (libraries lockfree qcheck qcheck-alcotest) + (libraries saturn qcheck qcheck-alcotest) (modules qcheck_skiplist)) (test (name stm_skiplist) (modules stm_skiplist) - (libraries lockfree qcheck-stm.sequential qcheck-stm.domain) + (libraries saturn qcheck-stm.sequential qcheck-stm.domain) (action (run %{test} --verbose))) diff --git a/test/skiplist/qcheck_skiplist.ml b/test/skiplist/qcheck_skiplist.ml index 484bdeac..94b65f81 100644 --- a/test/skiplist/qcheck_skiplist.ml +++ b/test/skiplist/qcheck_skiplist.ml @@ -1,4 +1,4 @@ -module Skiplist = Lockfree.Skiplist +module Skiplist = Saturn.Skiplist let tests_sequential = QCheck. diff --git a/test/skiplist/stm_skiplist.ml b/test/skiplist/stm_skiplist.ml index 50d96da5..7e6619b7 100644 --- a/test/skiplist/stm_skiplist.ml +++ b/test/skiplist/stm_skiplist.ml @@ -2,7 +2,7 @@ open QCheck open STM -module Skiplist = Lockfree.Skiplist +module Skiplist = Saturn.Skiplist module WSDConf = struct type cmd = Mem of int | Add of int | Remove of int