Stub out processes on luv backend

ocaml-multicore · Apr 1, 2023 · f402423 · f402423
1 parent 419c5fb
commit f402423
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/lib_eio_luv/eio_luv.ml b/lib_eio_luv/eio_luv.ml
@@ -959,6 +959,7 @@ type stdenv = <
   stdout : sink;
   stderr : sink;
   net : Eio.Net.t;
+  process_mgr : Eio.Process.mgr;
   domain_mgr : Eio.Domain_manager.t;
   clock : Eio.Time.clock;
   mono_clock : Eio.Time.Mono.t;
@@ -1160,6 +1161,7 @@ let stdenv ~run_event_loop =
     method stdout = Lazy.force stdout
     method stderr = Lazy.force stderr
     method net = net
+    method process_mgr = failwith "Processes are not supported using libuv"
     method domain_mgr = domain_mgr ~run_event_loop
     method clock = clock
     method mono_clock = mono_clock

diff --git a/lib_eio_luv/eio_luv.mli b/lib_eio_luv/eio_luv.mli
@@ -210,6 +210,7 @@ type stdenv = <
   stdout : sink;
   stderr : sink;
   net : Eio.Net.t;
+  process_mgr : Eio.Process.mgr;
   domain_mgr : Eio.Domain_manager.t;
   clock : Eio.Time.clock;
   mono_clock : Eio.Time.Mono.t;

diff --git a/lib_main/dune b/lib_main/dune
@@ -8,7 +8,7 @@
     (select posix_backend.ml from
             (eio_posix -> posix_backend.enabled.ml)
             (          -> posix_backend.disabled.ml))
-;     (select luv_backend.ml from
-;             (eio_luv -> luv_backend.enabled.ml)
-;             (        -> luv_backend.disabled.ml))
+    (select luv_backend.ml from
+            (eio_luv -> luv_backend.enabled.ml)
+            (        -> luv_backend.disabled.ml))
     ))
diff --git a/lib_main/eio_main.ml b/lib_main/eio_main.ml
@@ -4,12 +4,12 @@ let force run fn =
 let run fn =
   match Sys.getenv_opt "EIO_BACKEND" with
   | Some ("io-uring" | "linux") -> force Linux_backend.run fn
-  | None | Some "posix" -> force Posix_backend.run fn
-  (* | Some "luv" -> force Luv_backend.run fn
+  | Some "posix" -> force Posix_backend.run fn
+  | Some "luv" -> force Luv_backend.run fn
   | None | Some "" ->
     Linux_backend.run fn ~fallback:(fun _ ->
         Posix_backend.run fn ~fallback:(fun _ ->
             force Luv_backend.run fn
           )
-      ) *)
+      )
   | Some x -> Fmt.failwith "Unknown Eio backend %S (from $EIO_BACKEND)" x