status-im/nim-chronos
2
0
Fork 0
mirror of https://github.com/status-im/nim-chronos.git synced 2025-02-22 16:08:23 +00:00
Code Issues Projects Releases Wiki Activity

Properly fix cancellation race and not introduce FD leaks. (#102)

Browse Source
This commit is contained in:
Eugene Kabanov 2020-06-05 19:11:51 +03:00 committed by GitHub
parent d6d0084333
commit bedd1ded5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chronos/asyncloop.nim
View File

@ -629,8 +629,9 @@ elif unixPlatform:
let loop = getGlobalDispatcher() let loop = getGlobalDispatcher()
proc continuation(udata: pointer) = proc continuation(udata: pointer) =
unregister(fd) if SocketHandle(fd) in loop.selector:
close(SocketHandle(fd)) unregister(fd)
close(SocketHandle(fd))
if not isNil(aftercb): if not isNil(aftercb):
aftercb(nil) aftercb(nil)

6
chronos/transports/stream.nim
View File

@ -722,8 +722,7 @@ when defined(windows):
GC_unref(ovl) GC_unref(ovl)
proc cancel(udata: pointer) {.gcsafe.} = proc cancel(udata: pointer) {.gcsafe.} =
if not(retFuture.finished()): sock.closeSocket()
sock.closeSocket()
povl = RefCustomOverlapped() povl = RefCustomOverlapped()
GC_ref(povl) GC_ref(povl)
@ -1251,8 +1250,7 @@ else:
retFuture.complete(transp) retFuture.complete(transp)
proc cancel(udata: pointer) {.gcsafe.} = proc cancel(udata: pointer) {.gcsafe.} =
if not(retFuture.finished()): closeSocket(sock)
closeSocket(sock)
while true: while true:
var res = posix.connect(SocketHandle(sock), var res = posix.connect(SocketHandle(sock),