Regroup MS_queue and spsc_queue under their own subdirectory.

ocaml-multicore · Sep 9, 2024 · be1bf2e · be1bf2e
1 parent fe0b79c
commit be1bf2e
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 8 deletions.
diff --git a/src_lockfree/dune b/src_lockfree/dune
@@ -7,6 +7,9 @@ let () =
   Jbuild_plugin.V1.send
   @@ {|
 
+ (include_subdirs unqualified)
+
+
 (library
  (name saturn_lockfree)
  (public_name saturn_lockfree)

diff --git a/src_lockfree/michael_scott_queue.ml → ...ichael_scott_queue/michael_scott_queue.ml b/src_lockfree/michael_scott_queue.ml → ...ichael_scott_queue/michael_scott_queue.ml
diff --git a/src_lockfree/michael_scott_queue.mli → ...chael_scott_queue/michael_scott_queue.mli b/src_lockfree/michael_scott_queue.mli → ...chael_scott_queue/michael_scott_queue.mli
diff --git a/src_lockfree/michael_scott_queue_intf.ml → ...l_scott_queue/michael_scott_queue_intf.ml b/src_lockfree/michael_scott_queue_intf.ml → ...l_scott_queue/michael_scott_queue_intf.ml
diff --git a/src_lockfree/michael_scott_queue_unsafe.ml → ...scott_queue/michael_scott_queue_unsafe.ml b/src_lockfree/michael_scott_queue_unsafe.ml → ...scott_queue/michael_scott_queue_unsafe.ml
diff --git a/src_lockfree/michael_scott_queue_unsafe.mli → ...cott_queue/michael_scott_queue_unsafe.mli b/src_lockfree/michael_scott_queue_unsafe.mli → ...cott_queue/michael_scott_queue_unsafe.mli
diff --git a/...ckfree/michael_scott_queue_unsafe_node.ml → ..._queue/michael_scott_queue_unsafe_node.ml b/...ckfree/michael_scott_queue_unsafe_node.ml → ..._queue/michael_scott_queue_unsafe_node.ml
diff --git a/src_lockfree/spsc_queue.ml → src_lockfree/spsc_queue/spsc_queue.ml b/src_lockfree/spsc_queue.ml → src_lockfree/spsc_queue/spsc_queue.ml
diff --git a/src_lockfree/spsc_queue.mli → src_lockfree/spsc_queue/spsc_queue.mli b/src_lockfree/spsc_queue.mli → src_lockfree/spsc_queue/spsc_queue.mli
diff --git a/src_lockfree/spsc_queue_intf.ml → src_lockfree/spsc_queue/spsc_queue_intf.ml b/src_lockfree/spsc_queue_intf.ml → src_lockfree/spsc_queue/spsc_queue_intf.ml
diff --git a/src_lockfree/spsc_queue_unsafe.ml → src_lockfree/spsc_queue/spsc_queue_unsafe.ml b/src_lockfree/spsc_queue_unsafe.ml → src_lockfree/spsc_queue/spsc_queue_unsafe.ml
diff --git a/src_lockfree/spsc_queue_unsafe.mli → ...lockfree/spsc_queue/spsc_queue_unsafe.mli b/src_lockfree/spsc_queue_unsafe.mli → ...lockfree/spsc_queue/spsc_queue_unsafe.mli
diff --git a/test/michael_scott_queue/dune b/test/michael_scott_queue/dune
@@ -1,19 +1,21 @@
 (rule
  (action
-  (copy ../../src_lockfree/michael_scott_queue.ml michael_scott_queue.ml))
+  (copy
+   ../../src_lockfree/michael_scott_queue/michael_scott_queue.ml
+   michael_scott_queue.ml))
  (package saturn_lockfree))
 
 (rule
  (action
   (copy
-   ../../src_lockfree/michael_scott_queue_unsafe.ml
+   ../../src_lockfree/michael_scott_queue/michael_scott_queue_unsafe.ml
    michael_scott_queue_unsafe.ml))
  (package saturn_lockfree))
 
 (rule
  (action
   (copy
-   ../../src_lockfree/michael_scott_queue_intf.ml
+   ../../src_lockfree/michael_scott_queue/michael_scott_queue_intf.ml
    michael_scott_queue_intf.ml))
  (package saturn_lockfree))
 

diff --git a/test/michael_scott_queue/ms_queues/dune b/test/michael_scott_queue/ms_queues/dune
@@ -1,7 +1,7 @@
 (rule
  (action
   (copy
-   ../../../src_lockfree/michael_scott_queue_intf.ml
+   ../../../src_lockfree/michael_scott_queue/michael_scott_queue_intf.ml
    michael_scott_queue_intf.ml))
  (package saturn_lockfree))
 

diff --git a/test/spsc_queue/dune b/test/spsc_queue/dune
@@ -1,16 +1,18 @@
 (rule
  (action
-  (copy ../../src_lockfree/spsc_queue.ml spsc_queue.ml))
+  (copy ../../src_lockfree/spsc_queue/spsc_queue.ml spsc_queue.ml))
  (package saturn_lockfree))
 
 (rule
  (action
-  (copy ../../src_lockfree/spsc_queue_unsafe.ml spsc_queue_unsafe.ml))
+  (copy
+   ../../src_lockfree/spsc_queue/spsc_queue_unsafe.ml
+   spsc_queue_unsafe.ml))
  (package saturn_lockfree))
 
 (rule
  (action
-  (copy ../../src_lockfree/spsc_queue_intf.ml spsc_queue_intf.ml))
+  (copy ../../src_lockfree/spsc_queue/spsc_queue_intf.ml spsc_queue_intf.ml))
  (package saturn_lockfree))
 
 (test

diff --git a/test/spsc_queue/spsc_queues/dune b/test/spsc_queue/spsc_queues/dune
@@ -1,6 +1,8 @@
 (rule
  (action
-  (copy ../../../src_lockfree/spsc_queue_intf.ml spsc_queue_intf.ml))
+  (copy
+   ../../../src_lockfree/spsc_queue/spsc_queue_intf.ml
+   spsc_queue_intf.ml))
  (package saturn_lockfree))
 
 (library