diff options
author | Ray Imber <rayimber@gmail.com> | 2019-10-16 14:13:09 -0700 |
---|---|---|
committer | Ray Imber <rayimber@gmail.com> | 2019-10-16 14:13:09 -0700 |
commit | bef1c4437db3ec2afdcc0180c9eefb87aaf8fba6 (patch) | |
tree | 50fce845e456c3a4cf349b87a299eb70e0f2cf71 /lib/pure/ioselects/ioselectors_epoll.nim | |
parent | 233455a6856e33486c534efc0dd8bb3db1d1e601 (diff) | |
download | Nim-bef1c4437db3ec2afdcc0180c9eefb87aaf8fba6.tar.gz |
fixes based on code review by @dom96
- For clarity: Changed the unregister if statement to use the in operator instead of the set intersection operator in ioselectors_epoll.nim and ioselectors_select.nim. - Fixed unregister of Event.User case on the Android branch.
Diffstat (limited to 'lib/pure/ioselects/ioselectors_epoll.nim')
-rw-r--r-- | lib/pure/ioselects/ioselectors_epoll.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/ioselects/ioselectors_epoll.nim b/lib/pure/ioselects/ioselectors_epoll.nim index da7ef8a9a..bf13cc83e 100644 --- a/lib/pure/ioselects/ioselectors_epoll.nim +++ b/lib/pure/ioselects/ioselectors_epoll.nim @@ -197,7 +197,7 @@ proc unregister*[T](s: Selector[T], fd: int|SocketHandle) = "Descriptor $# is not registered in the selector!" % $fdi) if pkey.events != {}: when not defined(android): - if pkey.events * {Event.Read, Event.Write, Event.User} != {}: + if Event.Read in pkey.events or Event.Write in pkey.events or Event.User in pkey.events: var epv = EpollEvent() # TODO: Refactor all these EPOLL_CTL_DEL + dec(s.count) into a proc. if epoll_ctl(s.epollFD, EPOLL_CTL_DEL, fdi.cint, addr epv) != 0: @@ -237,7 +237,7 @@ proc unregister*[T](s: Selector[T], fd: int|SocketHandle) = if posix.close(cint(fdi)) != 0: raiseIOSelectorsError(osLastError()) else: - if pkey.events * {Event.Read, Event.Write} != {}: + if Event.Read in pkey.events or Event.Write in pkey.events or Event.User in pkey.events: var epv = EpollEvent() if epoll_ctl(s.epollFD, EPOLL_CTL_DEL, fdi.cint, addr epv) != 0: raiseIOSelectorsError(osLastError()) |