Upgrade to be kcas 0.4.0 compatible

This adapts Reagents to the following changes in kcas:

- kcas_data 0.2.4 includes a `Queue` module.
- kcas 0.3.0 removed the `Tx` api.
- kcas 0.4.0 added an optional `mode` argument to locations.

Author: polytypic

dune-project

@@ -16,6 +16,7 @@
   (lockfree (>= 0.3.0))
   (kcas (>= 0.2.0))
   (alcotest (and :with-test (>= 1.6.0)))
+  (kcas_data (and (>= 0.2.3) :with-test))
   )
  (synopsis "Composable lock-free data and synchronization structures")
  (description "Reagents - Composable lock-free data and synchronization structures"))

lib/postCommitCas.ml

@@ -19,7 +19,7 @@ module Op = Kcas.Op
 
 type 'a ref = 'a Loc.t
 
-let ref = Loc.make
+let ref x = Loc.make x
 let get = Loc.get
 
 type cas_kind = Real of Op.t | Imm of bool

reagents.opam

@@ -15,6 +15,7 @@ depends: [
   "lockfree" {>= "0.3.0"}
   "kcas" {>= "0.2.0"}
   "alcotest" {with-test & >= "1.6.0"}
+  "kcas_data" {>= "0.2.3" & with-test}
   "odoc" {with-doc}
 ]
 build: [

tests/dune

@@ -31,7 +31,7 @@
 (test
  (name queue_test)
  (modules queue_test)
- (libraries reagents references))
+ (libraries reagents references kcas_data))
 
 (test
  (name reagent_queue_test)

tests/queue_test.ml

@@ -94,22 +94,18 @@ module Test (Q : QUEUE) = struct
     Reagents.run (CDL.await b) ()
 end
 
-module MakeQ_tx (T : sig
-  open Kcas
-
+module Make_queue (T : sig
   type 'a t
 
   val create : unit -> 'a t
-  val push : 'a t -> 'a -> unit Tx.t
-  val pop : 'a t -> 'a option Tx.t
+  val push : 'a -> 'a t -> unit
+  val take_opt : 'a t -> 'a option
 end) : QUEUE = struct
-  open Kcas
-
   type 'a t = 'a T.t
 
   let create = T.create
-  let push queue value = Tx.commit @@ T.push queue value
-  let pop queue = Tx.commit @@ T.pop queue
+  let push queue value = T.push value queue
+  let pop queue = T.take_opt queue
 end
 
 let main () =
@@ -123,14 +119,9 @@ let main () =
   Printf.printf "Two_lock_queue : mean = %f, sd = %f tp=%f\n%!" m sd
     (float_of_int num_items /. m);
 
-  let module M = Test (MakeQ_tx (References.Tx_linked_queue)) in
-  let m, sd = Benchmark.benchmark (fun () -> M.run num_doms items_per_dom) 5 in
-  Printf.printf "Kcas linked queue : mean = %f, sd = %f tp=%f\n%!" m sd
-    (float_of_int num_items /. m);
-
-  let module M = Test (MakeQ_tx (References.Tx_two_stack_queue)) in
+  let module M = Test (Make_queue (Kcas_data.Queue)) in
   let m, sd = Benchmark.benchmark (fun () -> M.run num_doms items_per_dom) 5 in
-  Printf.printf "Kcas 2-stack queue : mean = %f, sd = %f tp=%f\n%!" m sd
+  Printf.printf "Kcas_data.Queue : mean = %f, sd = %f tp=%f\n%!" m sd
     (float_of_int num_items /. m);
 
   let module M = Test (MakeQ (Reagents.Data.MichaelScott_queue)) in

tests/references/dune

@@ -1,3 +1,3 @@
 (library
  (name references)
- (libraries kcas unix))
+ (libraries unix))