mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2025-12-29 17:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'async-readwrite-no-conflict' of https://github.com/endragor/Nim into endragor-async-readwrite-no-conflict

Browse Source
This commit is contained in:
Andreas Rumpf
2016-09-04 23:41:18 +02:00
parent dfa0699e73 b676a08b3a
commit a5be42c024
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/upcoming/asyncdispatch.nim
View File

@@ -1373,19 +1373,25 @@ else:
proc addRead*(fd: AsyncFD, cb: Callback) =
let p = getGlobalDispatcher()
var newEvents = {Event.Read}
withData(p.selector, fd.SocketHandle, adata) do:
adata.readCB = cb
if adata.writeCB != nil:
newEvents.incl(Event.Write)
do:
raise newException(ValueError, "File descriptor not registered.")
p.selector.updateHandle(fd.SocketHandle, {Event.Read})
p.selector.updateHandle(fd.SocketHandle, newEvents)
proc addWrite*(fd: AsyncFD, cb: Callback) =
let p = getGlobalDispatcher()
var newEvents = {Event.Write}
withData(p.selector, fd.SocketHandle, adata) do:
adata.writeCB = cb
if adata.readCB != nil:
newEvents.incl(Event.Read)
do:
raise newException(ValueError, "File descriptor not registered.")
p.selector.updateHandle(fd.SocketHandle, {Event.Write})
p.selector.updateHandle(fd.SocketHandle, newEvents)
proc poll*(timeout = 500) =
var keys: array[64, ReadyKey[AsyncData]]