Rename asyncdispatch.close to asyncdispatch.closeSocket.
This commit is contained in:
parent
b54f66eeff
commit
6a38d36239
3 changed files with 6 additions and 6 deletions
|
|
@ -532,7 +532,7 @@ when defined(windows) or defined(nimdoc):
|
||||||
result.TSocketHandle.setBlocking(false)
|
result.TSocketHandle.setBlocking(false)
|
||||||
register(result)
|
register(result)
|
||||||
|
|
||||||
proc close*(socket: TAsyncFD) =
|
proc closeSocket*(socket: TAsyncFD) =
|
||||||
## Closes a socket and ensures that it is unregistered.
|
## Closes a socket and ensures that it is unregistered.
|
||||||
socket.TSocketHandle.close()
|
socket.TSocketHandle.close()
|
||||||
getGlobalDispatcher().handles.excl(socket)
|
getGlobalDispatcher().handles.excl(socket)
|
||||||
|
|
@ -581,7 +581,7 @@ else:
|
||||||
result.TSocketHandle.setBlocking(false)
|
result.TSocketHandle.setBlocking(false)
|
||||||
register(result)
|
register(result)
|
||||||
|
|
||||||
proc close*(sock: TAsyncFD) =
|
proc closeSocket*(sock: TAsyncFD) =
|
||||||
let disp = getGlobalDispatcher()
|
let disp = getGlobalDispatcher()
|
||||||
sock.TSocketHandle.close()
|
sock.TSocketHandle.close()
|
||||||
disp.selector.unregister(sock.TSocketHandle)
|
disp.selector.unregister(sock.TSocketHandle)
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,7 @@ proc listen*(socket: PAsyncSocket, backlog = SOMAXCONN) =
|
||||||
|
|
||||||
proc close*(socket: PAsyncSocket) =
|
proc close*(socket: PAsyncSocket) =
|
||||||
## Closes the socket.
|
## Closes the socket.
|
||||||
socket.fd.TAsyncFD.close()
|
socket.fd.TAsyncFD.closeSocket()
|
||||||
# TODO SSL
|
# TODO SSL
|
||||||
|
|
||||||
when isMainModule:
|
when isMainModule:
|
||||||
|
|
|
||||||
|
|
@ -23,19 +23,19 @@ proc launchSwarm(port: TPort) {.async.} =
|
||||||
await connect(sock, "localhost", port)
|
await connect(sock, "localhost", port)
|
||||||
when true:
|
when true:
|
||||||
await sendMessages(sock)
|
await sendMessages(sock)
|
||||||
close(sock)
|
closeSocket(sock)
|
||||||
else:
|
else:
|
||||||
# Issue #932: https://github.com/Araq/Nimrod/issues/932
|
# Issue #932: https://github.com/Araq/Nimrod/issues/932
|
||||||
var msgFut = sendMessages(sock)
|
var msgFut = sendMessages(sock)
|
||||||
msgFut.callback =
|
msgFut.callback =
|
||||||
proc () =
|
proc () =
|
||||||
close(sock)
|
closeSocket(sock)
|
||||||
|
|
||||||
proc readMessages(client: TAsyncFD) {.async.} =
|
proc readMessages(client: TAsyncFD) {.async.} =
|
||||||
while true:
|
while true:
|
||||||
var line = await recvLine(client)
|
var line = await recvLine(client)
|
||||||
if line == "":
|
if line == "":
|
||||||
close(client)
|
closeSocket(client)
|
||||||
clientCount.inc
|
clientCount.inc
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue