Merge pull request #461 from dinosaure/lwt-yield

Use Lwt.pause instead of Lwt_{unix,main}.yield
mirage · Dec 2, 2021 · ccf3242 · ccf3242
2 parents afe4144 + c6be8bf
commit ccf3242
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/test/test_deadlock.ml b/test/test_deadlock.ml
@@ -143,7 +143,7 @@ let test_digest netif1 netif2 =
 
 let run_vnetif () =
   let backend = Basic_backend.Make.create
-      ~use_async_readers:true ~yield:Lwt_unix.yield () in
+      ~use_async_readers:true ~yield:Lwt.pause () in
   TCPIP.M.NETIF.connect ~size_limit:mtu backend >>= fun c1 ->
   TCPIP.M.NETIF.connect ~size_limit:mtu backend >>= fun c2 ->
   test_digest c1 c2

diff --git a/test/test_icmpv4.ml b/test/test_icmpv4.ml
@@ -46,7 +46,7 @@ let speaker_address = Ipaddr.V4.of_string_exn "192.168.222.10"
 let header_size = Ethernet_wire.sizeof_ethernet
 
 let get_stack ?(backend = B.create ~use_async_readers:true
-                  ~yield:(fun() -> Lwt_main.yield ()) ())
+                  ~yield:(fun() -> Lwt.pause ()) ())
                   ip =
   let cidr = Ipaddr.V4.Prefix.make 24 ip in
   V.connect backend >>= fun netif ->

diff --git a/test/test_udp.ml b/test/test_udp.ml
@@ -18,7 +18,7 @@ type stack = {
 }
 
 let get_stack ?(backend = B.create ~use_async_readers:true
-                  ~yield:(fun() -> Lwt_main.yield ()) ()) ip =
+                  ~yield:(fun() -> Lwt.pause ()) ()) ip =
   let open Lwt.Infix in
   let cidr = Ipaddr.V4.Prefix.make 24 ip in
   V.connect backend >>= fun netif ->

diff --git a/test/vnetif_backends.ml b/test/vnetif_backends.ml
@@ -59,7 +59,7 @@ module Frame_size_enforced = struct
   let set_max_ip_mtu t m = t.frame_size <- m + Ethernet_wire.sizeof_ethernet
 
   let create ~frame_size () =
-    let xt = X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield () ) () in
+    let xt = X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause () ) () in
     { xt ; frame_size }
 
   let create () =
@@ -88,7 +88,7 @@ module Trailing_bytes : Backend = struct
         fn (add_random_bytes buf))
 
   let create () =
-    X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield () ) ()
+    X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause () ) ()
 
 end
 
@@ -108,7 +108,7 @@ module Uniform_packet_loss : Backend = struct
       X.write t id ~size fill (* pass to real write *)
 
   let create () =
-    X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield () ) ()
+    X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause () ) ()
 
 end
 
@@ -132,7 +132,7 @@ module Uniform_no_payload_packet_loss : Backend = struct
       X.write t id ~size fill (* pass to real write *)
 
   let create () =
-    X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield () ) ()
+    X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause () ) ()
 end
 
 (** This backend drops packets for 1 second after 1 megabyte has been
@@ -200,7 +200,7 @@ module Drop_1_second_after_1_megabyte : Backend = struct
       X.write t.xt id ~size fill (* pass to real write *)
 
   let create () =
-    let xt = X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield ()) () in
+    let xt = X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause ()) () in
     { xt ; done_dropping = false; is_dropping = false; sent_bytes = 0 }
 
 end
@@ -222,7 +222,7 @@ module On_off_switch = struct
       X.write t id ~size fill (* pass to real write *)
 
   let create () =
-    X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield () ) ()
+    X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause () ) ()
 
 end
 
@@ -232,5 +232,5 @@ module Basic : Backend = struct
   include X
 
   let create () =
-    X.create ~use_async_readers:true ~yield:(fun() -> Lwt_main.yield () ) ()
+    X.create ~use_async_readers:true ~yield:(fun() -> Lwt.pause () ) ()
 end