jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upcoming/asyncdispatch: addTimer and addEvent fixes

Browse source
This commit is contained in:
Araq 2016-11-30 01:47:37 +01:00
commit 9b68b878b2
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/upcoming/asyncdispatch.nim
View file

@ -827,7 +827,7 @@ when defined(windows) or defined(nimdoc):
cast[pointer](p.ovl)) cast[pointer](p.ovl))
{.pop.} {.pop.}
template registerWaitableEvent(mask) = proc registerWaitableEvent(fd: AsyncFD, cb: Callback; mask: Dword) =
let p = getGlobalDispatcher() let p = getGlobalDispatcher()
var flags = (WT_EXECUTEINWAITTHREAD or WT_EXECUTEONLYONCE).Dword var flags = (WT_EXECUTEINWAITTHREAD or WT_EXECUTEONLYONCE).Dword
var hEvent = wsaCreateEvent() var hEvent = wsaCreateEvent()
@ -919,7 +919,7 @@ when defined(windows) or defined(nimdoc):
## Be sure your callback ``cb`` returns ``true``, if you want to remove ## Be sure your callback ``cb`` returns ``true``, if you want to remove
## watch of `read` notifications, and ``false``, if you want to continue ## watch of `read` notifications, and ``false``, if you want to continue
## receiving notifies. ## receiving notifies.
registerWaitableEvent(FD_READ or FD_ACCEPT or FD_OOB or FD_CLOSE) registerWaitableEvent(fd, cb, FD_READ or FD_ACCEPT or FD_OOB or FD_CLOSE)
proc addWrite*(fd: AsyncFD, cb: Callback) = proc addWrite*(fd: AsyncFD, cb: Callback) =
## Start watching the file descriptor for write availability and then call ## Start watching the file descriptor for write availability and then call
@ -936,7 +936,7 @@ when defined(windows) or defined(nimdoc):
## Be sure your callback ``cb`` returns ``true``, if you want to remove ## Be sure your callback ``cb`` returns ``true``, if you want to remove
## watch of `write` notifications, and ``false``, if you want to continue ## watch of `write` notifications, and ``false``, if you want to continue
## receiving notifies. ## receiving notifies.
registerWaitableEvent(FD_WRITE or FD_CONNECT or FD_CLOSE) registerWaitableEvent(fd, cb, FD_WRITE or FD_CONNECT or FD_CLOSE)
template registerWaitableHandle(p, hEvent, flags, pcd, timeout, handleCallback) = template registerWaitableHandle(p, hEvent, flags, pcd, timeout, handleCallback) =
let handleFD = AsyncFD(hEvent) let handleFD = AsyncFD(hEvent)
@ -944,7 +944,8 @@ when defined(windows) or defined(nimdoc):
pcd.handleFd = handleFD pcd.handleFd = handleFD
var ol = PCustomOverlapped() var ol = PCustomOverlapped()
GC_ref(ol) GC_ref(ol)
ol.data = CompletionData(fd: handleFD, cb: handleCallback) ol.data.fd = handleFD
ol.data.cb = handleCallback
# We need to protect our callback environment value, so GC will not free it # We need to protect our callback environment value, so GC will not free it
# accidentally. # accidentally.
ol.data.cell = system.protect(rawEnv(ol.data.cb)) ol.data.cell = system.protect(rawEnv(ol.data.cb))
@ -986,6 +987,9 @@ when defined(windows) or defined(nimdoc):
discard closeHandle(hEvent) discard closeHandle(hEvent)
deallocShared(cast[pointer](pcd)) deallocShared(cast[pointer](pcd))
p.handles.excl(fd) p.handles.excl(fd)
else:
GC_ref(pcd.ovl)
pcd.ovl.data.cell = system.protect(rawEnv(pcd.ovl.data.cb))
registerWaitableHandle(p, hEvent, flags, pcd, timeout, timercb) registerWaitableHandle(p, hEvent, flags, pcd, timeout, timercb)
@ -1066,8 +1070,13 @@ when defined(windows) or defined(nimdoc):
if cb(fd): if cb(fd):
# we need this check to avoid exception, if `unregister(event)` was # we need this check to avoid exception, if `unregister(event)` was
# called in callback. # called in callback.
if ev.hWaiter != 0: unregister(ev) if ev.hWaiter != 0:
GC_ref(pcd.ovl)
pcd.ovl.data.cell = system.protect(rawEnv(pcd.ovl.data.cb))
deallocShared(cast[pointer](pcd)) deallocShared(cast[pointer](pcd))
else:
GC_ref(pcd.ovl)
pcd.ovl.data.cell = system.protect(rawEnv(pcd.ovl.data.cb))
registerWaitableHandle(p, hEvent, flags, pcd, INFINITE, eventcb) registerWaitableHandle(p, hEvent, flags, pcd, INFINITE, eventcb)
ev.hWaiter = pcd.waitFd ev.hWaiter = pcd.waitFd