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

Merge branch 'Fix5290_1' of https://github.com/cheatfate/Nim into cheatfate-Fix5290_1

Browse source
This commit is contained in:
Andreas Rumpf 2017-01-29 13:39:32 +01:00
commit eca72755bb
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/pure/ioselects/ioselectors_kqueue.nim
View file

@ -93,6 +93,16 @@ proc newSelector*[T](): Selector[T] =
if kqFD < 0: if kqFD < 0:
raiseIOSelectorsError(osLastError()) raiseIOSelectorsError(osLastError())
# we allocating empty socket to duplicate it handle in future, to get unique
# indexes for `fds` array. This is needed to properly identify
# {Event.Timer, Event.Signal, Event.Process} events.
let usock = posix.socket(posix.AF_INET, posix.SOCK_STREAM,
posix.IPPROTO_TCP).cint
if usock == -1:
let err = osLastError()
discard posix.close(kqFD)
raiseIOSelectorsError(err)
when hasThreadSupport: when hasThreadSupport:
result = cast[Selector[T]](allocShared0(sizeof(SelectorImpl[T]))) result = cast[Selector[T]](allocShared0(sizeof(SelectorImpl[T])))
result.fds = allocSharedArray[SelectorKey[T]](maxFD) result.fds = allocSharedArray[SelectorKey[T]](maxFD)
@ -104,17 +114,10 @@ proc newSelector*[T](): Selector[T] =
result.fds = newSeq[SelectorKey[T]](maxFD) result.fds = newSeq[SelectorKey[T]](maxFD)
result.changes = newSeqOfCap[KEvent](MAX_KQUEUE_EVENTS) result.changes = newSeqOfCap[KEvent](MAX_KQUEUE_EVENTS)
result.sock = usock
result.kqFD = kqFD result.kqFD = kqFD
result.maxFD = maxFD.int result.maxFD = maxFD.int
# we allocating empty socket to duplicate it handle in future, to get unique
# indexes for `fds` array. This is needed to properly identify
# {Event.Timer, Event.Signal, Event.Process} events.
result.sock = posix.socket(posix.AF_INET, posix.SOCK_STREAM,
posix.IPPROTO_TCP).cint
if result.sock == -1:
raiseIOSelectorsError(osLastError())
proc close*[T](s: Selector[T]) = proc close*[T](s: Selector[T]) =
let res = posix.close(s.kqFD) let res = posix.close(s.kqFD)
when hasThreadSupport: when hasThreadSupport: