Rename asyncdispatch.close to asyncdispatch.closeSocket.

This commit is contained in:
Dominik Picheta
2014-05-23 13:14:28 +01:00
parent b54f66eeff
commit 6a38d36239
3 changed files with 6 additions and 6 deletions

View File

@@ -532,7 +532,7 @@ when defined(windows) or defined(nimdoc):
result.TSocketHandle.setBlocking(false)
register(result)
proc close*(socket: TAsyncFD) =
proc closeSocket*(socket: TAsyncFD) =
## Closes a socket and ensures that it is unregistered.
socket.TSocketHandle.close()
getGlobalDispatcher().handles.excl(socket)
@@ -581,7 +581,7 @@ else:
result.TSocketHandle.setBlocking(false)
register(result)
proc close*(sock: TAsyncFD) =
proc closeSocket*(sock: TAsyncFD) =
let disp = getGlobalDispatcher()
sock.TSocketHandle.close()
disp.selector.unregister(sock.TSocketHandle)

View File

@@ -220,7 +220,7 @@ proc listen*(socket: PAsyncSocket, backlog = SOMAXCONN) =
proc close*(socket: PAsyncSocket) =
## Closes the socket.
socket.fd.TAsyncFD.close()
socket.fd.TAsyncFD.closeSocket()
# TODO SSL
when isMainModule:

View File

@@ -23,19 +23,19 @@ proc launchSwarm(port: TPort) {.async.} =
await connect(sock, "localhost", port)
when true:
await sendMessages(sock)
close(sock)
closeSocket(sock)
else:
# Issue #932: https://github.com/Araq/Nimrod/issues/932
var msgFut = sendMessages(sock)
msgFut.callback =
proc () =
close(sock)
closeSocket(sock)
proc readMessages(client: TAsyncFD) {.async.} =
while true:
var line = await recvLine(client)
if line == "":
close(client)
closeSocket(client)
clientCount.inc
break
else: