asdf

riot/lib/io.ml

@@ -130,6 +130,7 @@ module Reader = struct
 
   let read : type src. src t -> buf:Buffer.t -> (int, [> `Closed ]) result =
    fun (Reader ((module R), src)) ~buf ->
+     Logger.trace(fun f -> f " IO.Reader.read");
     match R.read src ~buf with
     | Ok len -> Ok len
     | Error `Eof -> Ok 0

riot/lib/net.ml

@@ -41,10 +41,6 @@ end
 module Socket = struct
   include Runtime.Net.Socket
 
-  module Logger = Logger.Make (struct
-    let namespace = [ "riot"; "net"; "socket" ]
-  end)
-
   type listen_opts = {
     reuse_addr : bool;
     reuse_port : bool;
@@ -108,6 +104,7 @@ module Socket = struct
   let controlling_process _socket ~new_owner:_ = Ok ()
 
   let rec receive ?(timeout = Infinity) ~buf socket =
+    Logger.trace (fun f ->f "Riot.Net.Socket.receive");
     match Low_level.readv socket [| Io.Buffer.as_cstruct buf |] with
     | exception Fd.(Already_closed _) -> Error `Closed
     | `Abort reason -> Error (`Unix_error reason)

riot/runtime/net/io.ml

@@ -185,14 +185,15 @@ let write (fd : Fd.t) buf off len : write =
 external riot_readv : Unix.file_descr -> Cstruct.t array -> int
   = "caml_riot_posix_readv"
 
-let readv (fd : Fd.t) (cs : Cstruct.t array) : read =
+let rec readv (fd : Fd.t) (cs : Cstruct.t array) : read =
   Fd.use ~op_name:"readv" fd @@ fun unix_fd ->
   Log.debug (fun f -> f "Readv-ing from fd=%a" Fd.pp fd);
   match riot_readv unix_fd cs with
   | len ->
       Log.debug (fun f -> f "read %d bytes from fd=%a" len Fd.pp fd);
       `Read len
-  | exception Unix.(Unix_error ((EINTR | EAGAIN | EWOULDBLOCK), _, _)) -> `Retry
+  | exception Unix.(Unix_error (EINTR, _, _)) -> readv fd cs
+  | exception Unix.(Unix_error ((EAGAIN | EWOULDBLOCK), _, _)) -> `Retry
   | exception Unix.(Unix_error (reason, _, _)) -> `Abort reason
 
 external riot_writev : Unix.file_descr -> Cstruct.t array -> int