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

Close async socket on error (instead of looping on epoll_wait with 100% CPU)

Browse source
This commit is contained in:
def 2015-01-04 22:59:41 +01:00
commit d60d007281
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/asyncdispatch.nim
View file

@ -878,6 +878,10 @@ else:
let data = PData(info.key.data) let data = PData(info.key.data)
assert data.fd == info.key.fd.TAsyncFD assert data.fd == info.key.fd.TAsyncFD
#echo("In poll ", data.fd.cint) #echo("In poll ", data.fd.cint)
if EvError in info.events:
closeSocket(data.fd)
continue
if EvRead in info.events: if EvRead in info.events:
# Callback may add items to ``data.readCBs`` which causes issues if # Callback may add items to ``data.readCBs`` which causes issues if
# we are iterating over ``data.readCBs`` at the same time. We therefore # we are iterating over ``data.readCBs`` at the same time. We therefore

5
lib/pure/selectors.nim
View file

@ -23,7 +23,7 @@ proc `$`*(x: SocketHandle): string {.borrow.}
type type
Event* = enum Event* = enum
EvRead, EvWrite EvRead, EvWrite, EvError
SelectorKey* = ref object SelectorKey* = ref object
fd*: SocketHandle fd*: SocketHandle
@ -152,6 +152,9 @@ elif defined(linux):
let fd = s.events[i].data.fd.SocketHandle let fd = s.events[i].data.fd.SocketHandle
var evSet: set[Event] = {} var evSet: set[Event] = {}
if (s.events[i].events and EPOLLERR) != 0: evSet = evSet + {EvError}
if (s.events[i].events and EPOLLHUP) != 0: evSet = evSet + {EvError}
if (s.events[i].events and EPOLLRDHUP) != 0: evSet = evSet + {EvError}
if (s.events[i].events and EPOLLIN) != 0: evSet = evSet + {EvRead} if (s.events[i].events and EPOLLIN) != 0: evSet = evSet + {EvRead}
if (s.events[i].events and EPOLLOUT) != 0: evSet = evSet + {EvWrite} if (s.events[i].events and EPOLLOUT) != 0: evSet = evSet + {EvWrite}
let selectorKey = s.fds[fd] let selectorKey = s.fds[fd]