Merge pull request #39 from c-cube/simon/reduce-scope-2025-07-09

reduce scope of the library a bit

Author: c-cube

.github/workflows/gh-pages.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Use OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: '5.0'
+          ocaml-compiler: '5.3'
           dune-cache: true
           allow-prerelease-opam: true
 

.github/workflows/main.yml

@@ -16,8 +16,8 @@ jobs:
         os:
             - ubuntu-latest
         ocaml-compiler:
-            - '4.14'
-            - '5.2'
+            - '5.0'
+            - '5.3'
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -32,15 +32,10 @@ jobs:
       - run: opam pin picos 0.6.0 -y -n
 
       - run: opam install -t moonpool moonpool-lwt moonpool-io --deps-only
-        if: matrix.ocaml-compiler == '5.2'
-      - run: opam install -t moonpool --deps-only
-        if: matrix.ocaml-compiler != '5.2'
       - run: opam exec -- dune build @install
 
       # install some depopts
       - run: opam install thread-local-storage trace hmap
-        if: matrix.ocaml-compiler == '5.2'
-
       - run: opam exec -- dune build --profile=release --force @install @runtest
 
   compat:

benchs/dune

@@ -1,6 +1,3 @@
 (executables
  (names fib_rec pi primes)
- (preprocess
-  (action
-   (run %{project_root}/src/cpp/cpp.exe %{input-file})))
  (libraries moonpool moonpool.forkjoin unix trace trace-tef domainslib))

benchs/pi.ml

@@ -66,8 +66,6 @@ let run_par1 ~kind (num_steps : int) : float =
   let pi = step *. Lock.get global_sum in
   pi
 
-[@@@ifge 5.0]
-
 let run_fork_join ~kind num_steps : float =
   let@ pool = with_pool ~kind () in
 
@@ -92,13 +90,6 @@ let run_fork_join ~kind num_steps : float =
   let pi = step *. Lock.get global_sum in
   pi
 
-[@@@else_]
-
-let run_fork_join _ =
-  failwith "fork join not available on this version of OCaml"
-
-[@@@endif]
-
 type mode =
   | Sequential
   | Par1

dune-project

@@ -16,7 +16,7 @@
  (name moonpool)
  (synopsis "Pools of threads supported by a pool of domains")
  (depends
-  (ocaml (>= 4.14))
+  (ocaml (>= 5.0))
   dune
   (either (>= 1.0))
   (trace :with-test)

moonpool.opam

@@ -9,7 +9,7 @@ tags: ["thread" "pool" "domain" "futures" "fork-join"]
 homepage: "https://github.com/c-cube/moonpool"
 bug-reports: "https://github.com/c-cube/moonpool/issues"
 depends: [
-  "ocaml" {>= "4.14"}
+  "ocaml" {>= "5.0"}
   "dune" {>= "3.0"}
   "either" {>= "1.0"}
   "trace" {with-test}

src/core/bounded_queue.ml

@@ -70,8 +70,6 @@ let close (self : _ t) : unit =
   Mutex.unlock self.mutex;
   Queue.iter Trigger.signal q
 
-[@@@ifge 5.0]
-
 let rec push (self : _ t) x : unit =
   Mutex.lock self.mutex;
 
@@ -120,5 +118,3 @@ let rec pop (self : 'a t) : 'a =
     Mutex.unlock self.mutex;
     Trigger.await_exn tr;
     pop self
-
-[@@@endif]

src/core/bounded_queue.mli

@@ -28,8 +28,6 @@ val close : _ t -> unit
 (** Close the channel. Further push and pop calls will fail. This is idempotent.
 *)
 
-[@@@ifge 5.0]
-
 val push : 'a t -> 'a -> unit
 (** Push the value into the channel, suspending the current task if the channel
     is currently full.
@@ -48,5 +46,3 @@ val pop_block_exn : 'a t -> 'a
     The precautions around blocking from inside a thread pool
     are the same as explained in {!Fut.wait_block}. *)
 *)
-
-[@@@endif]