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

Set O_NONBLOCK flag atomically (#13934)

Browse source 
These flags were added in Linux 2.6.27, I'm not sure Nim's minimal
support Linux version.
This commit is contained in:
Hiroki Noda 2020-04-23 03:24:45 +09:00 • committed by GitHub
commit 6cfe2e0c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pure/ioselects/ioselectors_epoll.nim
View file

@ -110,10 +110,9 @@ proc close*[T](s: Selector[T]) =
raiseIOSelectorsError(osLastError()) raiseIOSelectorsError(osLastError())
proc newSelectEvent*(): SelectEvent = proc newSelectEvent*(): SelectEvent =
let fdci = eventfd(0, O_CLOEXEC) let fdci = eventfd(0, O_CLOEXEC or O_NONBLOCK)
if fdci == -1: if fdci == -1:
raiseIOSelectorsError(osLastError()) raiseIOSelectorsError(osLastError())
setNonBlocking(fdci)
result = cast[SelectEvent](allocShared0(sizeof(SelectEventImpl))) result = cast[SelectEvent](allocShared0(sizeof(SelectEventImpl)))
result.efd = fdci result.efd = fdci
@ -269,10 +268,9 @@ proc registerTimer*[T](s: Selector[T], timeout: int, oneshot: bool,
var var
newTs: Itimerspec newTs: Itimerspec
oldTs: Itimerspec oldTs: Itimerspec
let fdi = timerfd_create(CLOCK_MONOTONIC, O_CLOEXEC).int let fdi = timerfd_create(CLOCK_MONOTONIC, O_CLOEXEC or O_NONBLOCK).int
if fdi == -1: if fdi == -1:
raiseIOSelectorsError(osLastError()) raiseIOSelectorsError(osLastError())
setNonBlocking(fdi.cint)
s.checkFd(fdi) s.checkFd(fdi)
doAssert(s.fds[fdi].ident == InvalidIdent) doAssert(s.fds[fdi].ident == InvalidIdent)
@ -314,10 +312,9 @@ when not defined(android):
discard sigaddset(nmask, cint(signal)) discard sigaddset(nmask, cint(signal))
blockSignals(nmask, omask) blockSignals(nmask, omask)
let fdi = signalfd(-1, nmask, O_CLOEXEC).int let fdi = signalfd(-1, nmask, O_CLOEXEC or O_NONBLOCK).int
if fdi == -1: if fdi == -1:
raiseIOSelectorsError(osLastError()) raiseIOSelectorsError(osLastError())
setNonBlocking(fdi.cint)
s.checkFd(fdi) s.checkFd(fdi)
doAssert(s.fds[fdi].ident == InvalidIdent) doAssert(s.fds[fdi].ident == InvalidIdent)
@ -341,10 +338,9 @@ when not defined(android):
discard sigaddset(nmask, posix.SIGCHLD) discard sigaddset(nmask, posix.SIGCHLD)
blockSignals(nmask, omask) blockSignals(nmask, omask)
let fdi = signalfd(-1, nmask, O_CLOEXEC).int let fdi = signalfd(-1, nmask, O_CLOEXEC or O_NONBLOCK).int
if fdi == -1: if fdi == -1:
raiseIOSelectorsError(osLastError()) raiseIOSelectorsError(osLastError())
setNonBlocking(fdi.cint)
s.checkFd(fdi) s.checkFd(fdi)
doAssert(s.fds[fdi].ident == InvalidIdent) doAssert(s.fds[fdi].ident == InvalidIdent)