Add a pin-depends to dscheck + formatting.

dune-project

@@ -50,4 +50,4 @@
    (>= 4.12.0))
   ;; Test dependencies
   (multicore-magic
-   (= :version))))
+   (>= 2.2.0))))

multicore-magic-dscheck.opam

@@ -9,7 +9,7 @@ bug-reports: "https://github.com/ocaml-multicore/multicore-magic/issues"
 depends: [
   "dune" {>= "3.14"}
   "ocaml" {>= "4.12.0"}
-  "multicore-magic" {= version}
+  "multicore-magic" {>= "2.2.0"}
   "odoc" {with-doc}
 ]
 build: [
@@ -27,3 +27,8 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/multicore-magic.git"
+pin-depends:
+  [
+  "dscheck.~dev"
+  "git+https://github.com/lyrm/dscheck.git#make_contended"
+  ]

multicore-magic-dscheck.opam.template

@@ -0,0 +1,5 @@
+pin-depends:
+  [
+  "dscheck.~dev"
+  "git+https://github.com/lyrm/dscheck.git#make_contended"
+  ]

src/dscheck/multicore_magic_atomic_array_dscheck.ml

@@ -17,4 +17,3 @@ let[@inline] unsafe_fenceless_get xs i = !(Obj.magic (at xs i))
 
 let[@inline] unsafe_compare_and_set xs i b a =
   Atomic.compare_and_set (at xs i) b a
-

src/dscheck/multicore_magic_dscheck.ml

@@ -1,6 +1,5 @@
 include Multicore_magic
 
-
 let[@inline] fenceless_get (atomic : 'a Atomic.t) =
   !(Sys.opaque_identity (Obj.magic atomic : 'a ref))
 
@@ -9,6 +8,5 @@ let[@inline] fenceless_set (atomic : 'a Atomic.t) value =
 
 let[@inline] fence atomic = Atomic.fetch_and_add atomic 0 |> ignore
 
-
 module Transparent_atomic = Transparent_atomic_dscheck
 module Atomic_array = Multicore_magic_atomic_array_dscheck

src/dscheck/transparent_atomic_dscheck.ml

@@ -1,3 +1,4 @@
 include Dscheck.TracedAtomic
+
 let fenceless_get = get
-let fenceless_set = set
+let fenceless_set = set