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

Async: Fixes problem when callbacks add other callbacks.

Browse source 
For context, see http://irclogs.nim-lang.org/19-11-2016.html#19:08:51
This commit is contained in:
Dominik Picheta 2016-11-19 20:16:15 +01:00
commit ffbe7382f8
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pure/asyncdispatch.nim
View file

@ -1061,28 +1061,34 @@ else:
# make a copy to iterate over. # make a copy to iterate over.
let currentCBs = data.readCBs let currentCBs = data.readCBs
data.readCBs = @[] data.readCBs = @[]
# Using another sequence because callbacks themselves can add
# other callbacks.
var newCBs: seq[Callback] = @[]
for cb in currentCBs: for cb in currentCBs:
if data.readCBs.len > 0: if newCBs.len > 0:
# A callback has already returned with EAGAIN, don't call any # A callback has already returned with EAGAIN, don't call any
# others until next `poll`. # others until next `poll`.
data.readCBs.add(cb) newCBs.add(cb)
else: else:
if not cb(data.fd): if not cb(data.fd):
# Callback wants to be called again. # Callback wants to be called again.
data.readCBs.add(cb) newCBs.add(cb)
data.readCBs = newCBs & data.readCBs
if EvWrite in info.events or info.events == {EvError}: if EvWrite in info.events or info.events == {EvError}:
let currentCBs = data.writeCBs let currentCBs = data.writeCBs
data.writeCBs = @[] data.writeCBs = @[]
var newCBs: seq[Callback] = @[]
for cb in currentCBs: for cb in currentCBs:
if data.writeCBs.len > 0: if newCBs.len > 0:
# A callback has already returned with EAGAIN, don't call any # A callback has already returned with EAGAIN, don't call any
# others until next `poll`. # others until next `poll`.
data.writeCBs.add(cb) newCBs.add(cb)
else: else:
if not cb(data.fd): if not cb(data.fd):
# Callback wants to be called again. # Callback wants to be called again.
data.writeCBs.add(cb) newCBs.add(cb)
data.writeCBs = newCBs & data.writeCBs
if info.key in p.selector: if info.key in p.selector:
var newEvents: set[Event] var newEvents: set[Event]