loader: use recvData instead of readData

recvData is a new method for PosixStream that does less weird magic than
readData.

Also, allow duplicates in unregWrite/unregRead; it's simpler to live
with them than to prevent them.

2 files changed, 20 insertions, 0 deletions

diff --git a/src/io/posixstream.nim b/src/io/posixstream.nim
index 04fe0e5c..66b2d0d9 100644
--- a/src/io/posixstream.nim
+++ b/src/io/posixstream.nim
@@ -62,6 +62,16 @@ proc psReadData(s: Stream, buffer: pointer, len: int): int =
   if result == -1:
     raisePosixIOError()
 
+method recvData*(s: PosixStream, buffer: pointer, len: int): int {.base.} =
+  let n = read(s.fd, buffer, len)
+  if n < 0:
+    raisePosixIOError()
+  if n == 0:
+    if unlikely(s.isend):
+      raise newException(EOFError, "eof")
+    s.isend = true
+  return n
+
 method sendData*(s: PosixStream, buffer: pointer, len: int): int {.base.} =
   #TODO use sendData instead
   let n = write(s.fd, buffer, len)
diff --git a/src/io/socketstream.nim b/src/io/socketstream.nim
index fb378083..38c43a84 100644
--- a/src/io/socketstream.nim
+++ b/src/io/socketstream.nim
@@ -49,6 +49,16 @@ proc sockWriteData(s: Stream, buffer: pointer, len: int) =
       raisePosixIOError()
     i += n
 
+method recvData*(s: SocketStream, buffer: pointer, len: int): int =
+  let n = s.source.recv(buffer, len)
+  if n < 0:
+    raisePosixIOError()
+  if n == 0:
+    if unlikely(s.isend):
+      raise newException(EOFError, "eof")
+    s.isend = true
+  return n
+
 method sendData*(s: SocketStream, buffer: pointer, len: int): int =
   let n = s.source.send(buffer, len)
   if n < 0: