Merge pull request #755 from talex5/cleanup

Minor code cleanups

lib_eio/core/dune

@@ -1,4 +1,4 @@
 (library
   (name eio__core)
   (public_name eio.core)
-  (libraries cstruct hmap lwt-dllist fmt optint domain-local-await eio.runtime_events))
+  (libraries hmap lwt-dllist fmt optint eio.runtime_events))

lib_eio/core/eio__core.ml

@@ -19,6 +19,4 @@ module Private = struct
       | Fork = Fiber.Fork
       | Get_context = Cancel.Get_context
   end
-
-  module Dla = Dla
 end

lib_eio/core/eio__core.mli

@@ -782,8 +782,4 @@ module Private : sig
     val v : t
     (** Backends should use this for {!Eio.Stdenv.debug}. *)
   end
-
-  module Dla : sig
-    val prepare_for_await : unit -> Domain_local_await.t
-  end
 end

lib_eio/mock/backend.ml

@@ -105,7 +105,7 @@ let run_full main =
   let result = ref None in
   let `Exit_scheduler =
     Domain_local_await.using
-      ~prepare_for_await:Eio.Private.Dla.prepare_for_await
+      ~prepare_for_await:Eio_utils.Dla.prepare_for_await
       ~while_running:(fun () ->
         fork ~new_fiber (fun () -> result := Some (main stdenv))) in
   match !result with

lib_eio/core/dla.ml → lib_eio/utils/dla.ml

@@ -7,10 +7,10 @@ let prepare_for_await () =
       | _ -> ()
   and await () =
     if Atomic.get state != `Released then
-      Suspend.enter "domain-local-await" @@ fun ctx enqueue ->
+      Eio.Private.Suspend.enter "domain-local-await" @@ fun ctx enqueue ->
       let awaiting = `Awaiting enqueue in
       if Atomic.compare_and_set state `Init awaiting then (
-        Cancel.Fiber_context.set_cancel_fn ctx (fun ex ->
+        Eio.Private.Fiber_context.set_cancel_fn ctx (fun ex ->
             if Atomic.compare_and_set state awaiting `Released then (
               enqueue (Error ex)
             )

lib_eio/utils/dla.mli

@@ -0,0 +1 @@
+val prepare_for_await : unit -> Domain_local_await.t

lib_eio/utils/dune

@@ -1,4 +1,4 @@
 (library
  (name eio_utils)
  (public_name eio.utils)
- (libraries eio psq fmt optint))
+ (libraries eio psq fmt optint domain-local-await))

lib_eio/utils/eio_utils.ml

@@ -5,3 +5,4 @@
 module Lf_queue = Lf_queue
 module Suspended = Suspended
 module Zzz = Zzz
+module Dla = Dla

lib_eio_linux/sched.ml

@@ -460,7 +460,7 @@ let run ~extra_effects st main arg =
   let `Exit_scheduler =
     let new_fiber = Fiber_context.make_root () in
     Domain_local_await.using
-      ~prepare_for_await:Eio.Private.Dla.prepare_for_await
+      ~prepare_for_await:Eio_utils.Dla.prepare_for_await
       ~while_running:(fun () ->
         fork ~new_fiber (fun () ->
             Switch.run_protected ~name:"eio_linux" (fun sw ->

lib_eio_posix/sched.ml

@@ -379,7 +379,7 @@ let run ~extra_effects t main x =
   let `Exit_scheduler =
     let new_fiber = Fiber_context.make_root () in
     Domain_local_await.using
-      ~prepare_for_await:Eio.Private.Dla.prepare_for_await
+      ~prepare_for_await:Eio_utils.Dla.prepare_for_await
       ~while_running:(fun () ->
           fork ~new_fiber (fun () ->
               Eio_unix.Private.Thread_pool.run t.thread_pool @@ fun () ->

lib_eio_windows/sched.ml

@@ -370,7 +370,7 @@ let run ~extra_effects t main x =
   let `Exit_scheduler =
     let new_fiber = Fiber_context.make_root () in
     Domain_local_await.using
-      ~prepare_for_await:Eio.Private.Dla.prepare_for_await
+      ~prepare_for_await:Eio_utils.Dla.prepare_for_await
       ~while_running:(fun () ->
           fork ~new_fiber (fun () ->
               Eio_unix.Private.Thread_pool.run t.thread_pool @@ fun () ->