diff --git a/src/core/suspend_.ml b/src/core/suspend_.ml index 68ae01bb..193d3639 100644 --- a/src/core/suspend_.ml +++ b/src/core/suspend_.ml @@ -1,5 +1,3 @@ -module A = Atomic_ - type suspension = unit Exn_bt.result -> unit type task = unit -> unit diff --git a/src/lwt/IO.ml b/src/lwt/IO.ml index cc962e67..2775a400 100644 --- a/src/lwt/IO.ml +++ b/src/lwt/IO.ml @@ -11,12 +11,12 @@ let rec read fd buf i len : int = Moonpool.Private.Suspend_.suspend { handle = - (fun ~ls ~run:_ ~resume sus -> + (fun ~run:_ ~resume sus -> Perform_action_in_lwt.schedule @@ Action.Wait_readable ( fd, fun cancel -> - resume ~ls sus @@ Ok (); + resume sus @@ Ok (); Lwt_engine.stop_event cancel )); }; read fd buf i len @@ -33,12 +33,12 @@ let rec write_once fd buf i len : int = Moonpool.Private.Suspend_.suspend { handle = - (fun ~ls ~run:_ ~resume sus -> + (fun ~run:_ ~resume sus -> Perform_action_in_lwt.schedule @@ Action.Wait_writable ( fd, fun cancel -> - resume ~ls sus @@ Ok (); + resume sus @@ Ok (); Lwt_engine.stop_event cancel )); }; write_once fd buf i len @@ -60,12 +60,12 @@ let sleep_s (f : float) : unit = Moonpool.Private.Suspend_.suspend { handle = - (fun ~ls ~run:_ ~resume sus -> + (fun ~run:_ ~resume sus -> Perform_action_in_lwt.schedule @@ Action.Sleep ( f, false, fun cancel -> - resume ~ls sus @@ Ok (); + resume sus @@ Ok (); Lwt_engine.stop_event cancel )); } diff --git a/src/lwt/base.ml b/src/lwt/base.ml index 4ed374fa..1642587a 100644 --- a/src/lwt/base.ml +++ b/src/lwt/base.ml @@ -107,8 +107,8 @@ let await_lwt (fut : _ Lwt.t) = M.Private.Suspend_.suspend { handle = - (fun ~ls ~run:_ ~resume sus -> - let on_lwt_done _ = resume ~ls sus @@ Ok () in + (fun ~run:_ ~resume sus -> + let on_lwt_done _ = resume sus @@ Ok () in Perform_action_in_lwt.( schedule Action.(On_termination (fut, on_lwt_done)))); }; diff --git a/src/lwt/moonpool_lwt.ml b/src/lwt/moonpool_lwt.ml index c3133d2e..c89cebe2 100644 --- a/src/lwt/moonpool_lwt.ml +++ b/src/lwt/moonpool_lwt.ml @@ -48,12 +48,12 @@ module TCP_client = struct Moonpool.Private.Suspend_.suspend { handle = - (fun ~ls ~run:_ ~resume sus -> + (fun ~run:_ ~resume sus -> Perform_action_in_lwt.schedule @@ Action.Wait_writable ( sock, fun ev -> - resume ~ls sus @@ Ok (); + resume sus @@ Ok (); Lwt_engine.stop_event ev )); }; true