Merge branch 'master' into no-reenter

Author: arnetheduck

chronos/asyncloop.nim

@@ -152,14 +152,15 @@ elif defined(macosx) or defined(freebsd) or defined(netbsd) or
      defined(openbsd) or defined(dragonfly) or defined(macos) or
      defined(linux) or defined(android) or defined(solaris):
   import "."/selectors2
-  from posix import EINTR, EAGAIN, EINPROGRESS, EWOULDBLOCK, MSG_PEEK,
-                    MSG_NOSIGNAL,
+  import "."/oserrno
+  from posix import MSG_PEEK, MSG_NOSIGNAL,
                     SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT,
                     SIGBUS, SIGFPE, SIGKILL, SIGUSR1, SIGSEGV, SIGUSR2,
                     SIGPIPE, SIGALRM, SIGTERM, SIGPIPE
   export SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, SIGABRT,
          SIGBUS, SIGFPE, SIGKILL, SIGUSR1, SIGSEGV, SIGUSR2,
          SIGPIPE, SIGALRM, SIGTERM, SIGPIPE
+  export oserrno
 
 type
   CallbackFunc* = proc (arg: pointer) {.gcsafe, raises: [Defect].}
@@ -285,6 +286,12 @@ proc raiseOsDefect*(error: OSErrorCode, msg = "") {.noreturn, noinline.} =
   raise (ref Defect)(msg: msg & "\n[" & $int(error) & "] " & osErrorMsg(error) &
                           "\n" & getStackTrace())
 
+func toPointer(error: OSErrorCode): pointer =
+  when sizeof(int) == 8:
+    cast[pointer](uint64(uint32(error)))
+  else:
+    cast[pointer](uint32(error))
+
 func toException*(v: OSErrorCode): ref OSError = newOSError(v)
   # This helper will allow to use `tryGet()` and raise OSError for
   # Result[T, OSErrorCode] values.
@@ -511,27 +518,30 @@ when defined(windows):
     ## Closes a socket and ensures that it is unregistered.
     let loop = getThreadDispatcher()
     loop.handles.excl(fd)
-    let param =
-      if closeFd(SocketHandle(fd)) == 0:
-        OSErrorCode(0)
-      else:
-        osLastError()
-    if not isNil(aftercb):
-      var acb = AsyncCallback(function: aftercb, udata: cast[pointer](param))
-      loop.callbacks.addLast(acb)
+    let
+      param = toPointer(
+        if closeFd(SocketHandle(fd)) == 0:
+          OSErrorCode(0)
+        else:
+          osLastError()
+      )
+    if not(isNil(aftercb)):
+      loop.callbacks.addLast(AsyncCallback(function: aftercb, udata: param))
 
   proc closeHandle*(fd: AsyncFD, aftercb: CallbackFunc = nil) =
     ## Closes a (pipe/file) handle and ensures that it is unregistered.
     let loop = getThreadDispatcher()
     loop.handles.excl(fd)
-    let param =
-      if closeFd(HANDLE(fd)) == 0:
-        OSErrorCode(0)
-      else:
-        osLastError()
-    if not isNil(aftercb):
-      var acb = AsyncCallback(function: aftercb, udata: cast[pointer](param))
-      loop.callbacks.addLast(acb)
+    let
+      param = toPointer(
+        if closeFd(HANDLE(fd)) == 0:
+          OSErrorCode(0)
+        else:
+          osLastError()
+      )
+
+    if not(isNil(aftercb)):
+      loop.callbacks.addLast(AsyncCallback(function: aftercb, udata: param))
 
   proc contains*(disp: PDispatcher, fd: AsyncFD): bool =
     ## Returns ``true`` if ``fd`` is registered in thread's dispatcher.
@@ -712,21 +722,22 @@ elif defined(macosx) or defined(freebsd) or defined(netbsd) or
     let loop = getThreadDispatcher()
 
     proc continuation(udata: pointer) =
-      let param =
-        if SocketHandle(fd) in loop.selector:
-          let ures = unregister2(fd)
-          if ures.isErr():
-            discard closeFd(cint(fd))
-            ures.error()
-          else:
-            if closeFd(cint(fd)) != 0:
-              osLastError()
+      let
+        param = toPointer(
+          if SocketHandle(fd) in loop.selector:
+            let ures = unregister2(fd)
+            if ures.isErr():
+              discard closeFd(cint(fd))
+              ures.error()
             else:
-              OSErrorCode(0)
-        else:
-          OSErrorCode(osdefs.EBADF)
-      if not isNil(aftercb):
-        aftercb(cast[pointer](param))
+              if closeFd(cint(fd)) != 0:
+                osLastError()
+              else:
+                OSErrorCode(0)
+          else:
+            OSErrorCode(osdefs.EBADF)
+        )
+      if not(isNil(aftercb)): aftercb(param)
 
     withData(loop.selector, cint(fd), adata) do:
       # We are scheduling reader and writer callbacks to be called

chronos/asyncsync.nim

@@ -154,7 +154,10 @@ proc wakeUpFirst(lock: AsyncLock): bool {.inline.} =
       res = true
       break
   if i > 0:
-    lock.waiters.delete(0, i - 1)
+    when compiles(lock.waiters.delete(0 .. (i - 1))):
+      lock.waiters.delete(0 .. (i - 1))
+    else:
+      lock.waiters.delete(0, i - 1)
   res
 
 proc checkAll(lock: AsyncLock): bool {.inline.} =
@@ -272,7 +275,10 @@ proc wakeupNext(waiters: var seq[Future[void]]) {.inline.} =
       break
 
   if i > 0:
-    waiters.delete(0, i - 1)
+    when compiles(waiters.delete(0 .. (i - 1))):
+      waiters.delete(0 .. (i - 1))
+    else:
+      waiters.delete(0, i - 1)
 
 proc full*[T](aq: AsyncQueue[T]): bool {.inline.} =
   ## Return ``true`` if there are ``maxsize`` items in the queue.

chronos/ioselects/ioselectors_epoll.nim

@@ -42,7 +42,7 @@ proc getVirtualId[T](s: Selector[T]): SelectResult[int32] =
     ok(s.virtualHoles.popLast())
   else:
     if s.virtualId == low(int32):
-      err(OSErrorCode(EMFILE))
+      err(oserrno.EMFILE)
     else:
       dec(s.virtualId)
       ok(s.virtualId)
@@ -139,7 +139,7 @@ proc trigger2*(event: SelectEvent): SelectResult[void] =
   if res == -1:
     err(osLastError())
   elif res != sizeof(uint64):
-    err(OSErrorCode(osdefs.EINVAL))
+    err(oserrno.EINVAL)
   else:
     ok()
 
@@ -521,11 +521,11 @@ proc prepareKey[T](s: Selector[T], event: EpollEvent): Opt[ReadyKey] =
 
   if (event.events and EPOLLERR) != 0:
     rkey.events.incl(Event.Error)
-    rkey.errorCode = OSErrorCode(ECONNRESET)
+    rkey.errorCode = oserrno.ECONNRESET
 
   if (event.events and EPOLLHUP) != 0 or (event.events and EPOLLRDHUP) != 0:
     rkey.events.incl(Event.Error)
-    rkey.errorCode = OSErrorCode(ECONNRESET)
+    rkey.errorCode = oserrno.ECONNRESET
 
   if (event.events and EPOLLOUT) != 0:
     rkey.events.incl(Event.Write)
@@ -580,7 +580,8 @@ proc prepareKey[T](s: Selector[T], event: EpollEvent): Opt[ReadyKey] =
       let res = handleEintr(osdefs.read(fdi32, addr data, sizeof(uint64)))
       if res != sizeof(uint64):
         let errorCode = osLastError()
-        if errorCode == EAGAIN:
+        case errorCode
+        of oserrno.EAGAIN:
           return Opt.none(ReadyKey)
         else:
           rkey.events.incl({Event.User, Event.Error})

chronos/ioselects/ioselectors_kqueue.nim

@@ -58,6 +58,12 @@ proc toString(key: int32|cint|SocketHandle|int): string =
   else:
     Base10.toString(uint32(fdi32))
 
+proc toPointer(data: int32): pointer =
+  when sizeof(int) == 8:
+    cast[pointer](uint64(uint32(data)))
+  else:
+    cast[pointer](uint32(data))
+
 template addKey[T](s: Selector[T], key: int32, skey: SelectorKey[T]) =
   if s.fds.hasKeyOrPut(key, skey):
     raiseAssert "Descriptor [" & key.toString() &
@@ -154,7 +160,7 @@ proc trigger2*(event: SelectEvent): SelectResult[void] =
   if res == -1:
     err(osLastError())
   elif res != sizeof(uint64):
-    err(OSErrorCode(osdefs.EINVAL))
+    err(oserrno.EINVAL)
   else:
     ok()
 
@@ -310,7 +316,7 @@ proc registerSignal*[T](s: Selector[T], signal: int,
   # To be compatible with linux semantic we need to "eat" signals
   signal(cint(signal), SIG_IGN)
   changes.modifyKQueue(0, uint(signal), EVFILT_SIGNAL, EV_ADD, 0, 0,
-                       cast[pointer](uint32(fdi32)))
+                       fdi32.toPointer())
   if handleEintr(kevent(s.kqFd, addr(changes[0]), cint(1), nil, 0, nil)) == -1:
     let errorCode = osLastError()
     s.freeKey(fdi32)
@@ -341,7 +347,7 @@ proc registerProcess*[T](s: Selector[T], pid: int,
   s.addKey(fdi32, selectorKey)
 
   changes.modifyKQueue(0, uint(uint32(pid)), EVFILT_PROC, flags, NOTE_EXIT,
-                       0, cast[pointer](uint32(fdi32)))
+                       0, fdi32.toPointer())
   if handleEintr(kevent(s.kqFd, addr(changes[0]), cint(1), nil, 0, nil)) == -1:
     s.freeKey(fdi32)
     return err(osLastError())
@@ -490,14 +496,14 @@ proc prepareKey[T](s: Selector[T], event: KEvent): Opt[ReadyKey] =
   of EVFILT_READ:
     if (event.flags and EV_EOF) != 0:
       rkey.events.incl(Event.Error)
-      rkey.errorCode = OSErrorCode(ECONNRESET)
+      rkey.errorCode = oserrno.ECONNRESET
 
     if Event.User in pkey.events:
       var data: uint64 = 0
       if handleEintr(osdefs.read(cint(event.ident), addr data,
                                  sizeof(uint64))) != sizeof(uint64):
         let errorCode = osLastError()
-        if errorCode == EAGAIN:
+        if errorCode == oserrno.EAGAIN:
           # Someone already consumed event data
           return Opt.none(ReadyKey)
         else:
@@ -510,7 +516,7 @@ proc prepareKey[T](s: Selector[T], event: KEvent): Opt[ReadyKey] =
   of EVFILT_WRITE:
     if (event.flags and EV_EOF) != 0:
       rkey.events.incl(Event.Error)
-      rkey.errorCode = OSErrorCode(ECONNRESET)
+      rkey.errorCode = oserrno.ECONNRESET
 
     rkey.events.incl(Event.Write)
 
@@ -577,7 +583,7 @@ proc selectInto2*[T](s: Selector[T], timeout: int,
                        maxEventsCount, ptrTimeout)
           if res < 0:
             let errorCode = osLastError()
-            if errorCode == EINTR:
+            if errorCode == oserrno.EINTR:
               continue
             return err(errorCode)
           else:

chronos/osdefs.nim

@@ -6,25 +6,60 @@
 #                Licensed under either of
 #    Apache License, version 2.0, (LICENSE-APACHEv2)
 #                MIT license (LICENSE-MIT)
-
-from std/os import osLastError, osErrorMsg, OSErrorCode, raiseOSError,
-                   newOSError
-export osLastError, osErrorMsg, OSError, OSErrorCode, raiseOSError, newOSError
+import oserrno
+export oserrno
 
 when defined(windows):
-  from std/winlean import SocketHandle, SockLen, SockAddr, InAddr,
-                      In6_addr, Sockaddr_in, Sockaddr_in6, Sockaddr_storage,
-                      AddrInfo
-  export SocketHandle, SockLen, SockAddr, InAddr,
-         In6_addr, Sockaddr_in, Sockaddr_in6, Sockaddr_storage, AddrInfo
-
   # Prerequisites for constants
   template WSAIORW*(x, y): untyped = (IOC_INOUT or x or y)
   template WSAIOW*(x, y): untyped =
     clong(-2147483648) or
     ((clong(sizeof(int32)) and clong(IOCPARM_MASK)) shl 16) or (x shl 8) or y
 
   type
+    Sockaddr_storage* {.final, pure.} = object
+      ss_family*: uint16
+      ss_pad1: array[6, byte]
+      ss_align: int64
+      ss_pad2: array[112, byte]
+
+    InAddr* {.final, pure, union.} = object
+      s_addr*: uint32
+
+    In6Addr* {.final, pure, union.} = object
+      s_addr*: array[16, byte]
+
+    Sockaddr_in* {.final, pure.} = object
+      sin_family*: uint16
+      sin_port*: uint16
+      sin_addr*: InAddr
+      sin_zero*: array[0..7, char]
+
+    Sockaddr_in6* {.final, pure.} = object
+      sin6_family*: uint16
+      sin6_port*: uint16
+      sin6_flowinfo*: uint32
+      sin6_addr*: In6Addr
+      sin6_scope_id*: uint32
+
+    SockLen* = cuint
+
+    SockAddr* {.final, pure.} = object
+      sa_family*: uint16
+      sa_data*: array[14, char]
+
+    AddrInfo* {.final, pure.} = object
+      ai_flags*: cint           ## Input flags.
+      ai_family*: cint          ## Address family of socket.
+      ai_socktype*: cint        ## Socket type.
+      ai_protocol*: cint        ## Protocol of socket.
+      ai_addrlen*: csize_t      ## Length of socket address.
+      ai_canonname*: pointer    ## Canonical name of service location.
+      ai_addr*: ptr SockAddr    ## Socket address of socket.
+      ai_next*: ptr AddrInfo    ## Pointer to next in list.
+
+    SocketHandle* = distinct int
+
     HANDLE* = distinct uint
     GUID* {.final, pure.} = object
       D1*: uint32
@@ -104,36 +139,6 @@ when defined(windows):
     PIPE_UNLIMITED_INSTANCES* = 255'u32
     DEFAULT_PIPE_SIZE* = 65536'u32
 
-    ERROR_SUCCESS* = 0
-    ERROR_FILE_NOT_FOUND* = 2
-    ERROR_TOO_MANY_OPEN_FILES* = 4
-    ERROR_ACCESS_DENIED* = 5
-    ERROR_BROKEN_PIPE* = 109
-    ERROR_BUFFER_OVERFLOW* = 111
-    ERROR_PIPE_BUSY* = 231
-    ERROR_NO_DATA* = 232
-    ERROR_PIPE_NOT_CONNECTED* = 233
-    ERROR_PIPE_CONNECTED* = 535
-    ERROR_OPERATION_ABORTED* = 995
-    ERROR_IO_PENDING* = 997
-    ERROR_CONNECTION_REFUSED* = 1225
-    ERROR_CONNECTION_ABORTED* = 1236
-
-    WSAEMFILE* = 10024
-    WSAENETDOWN* = 10050
-    WSAENETRESET* = 10052
-    WSAECONNABORTED* = 10053
-    WSAECONNRESET* = 10054
-    WSAENOBUFS* = 10055
-    WSAETIMEDOUT* = 10060
-    WSAEADDRINUSE* = 10048
-    WSAEDISCON* = 10101
-    WSANOTINITIALISED* = 10093
-    WSAENOTSOCK* = 10038
-    WSAEINPROGRESS* = 10036
-    WSAEINTR* = 10004
-    WSAEWOULDBLOCK* = 10035
-    ERROR_NETNAME_DELETED* = 64
     STATUS_PENDING* = 0x103
 
     IOCPARM_MASK* = 0x7f'u32
@@ -1283,8 +1288,6 @@ when defined(posix):
     INVALID_SOCKET* = SocketHandle(-1)
     INVALID_HANDLE_VALUE* = cint(-1)
 
-proc `==`*(x: OSErrorCode, y: int): bool =
-  int(x) == y
 proc `==`*(x: SocketHandle, y: int): bool =
   x == SocketHandle(y)