From 0cac9d56e08a8dd9da83d5931bb209b2c8e1e812 Mon Sep 17 00:00:00 2001 From: Boris-Barboris Date: Sat, 11 Nov 2017 01:14:54 +0000 Subject: [PATCH 1/2] cancelConnectStream for Posix --- source/eventcore/driver.d | 7 +++++- source/eventcore/drivers/libasync.d | 5 +++++ source/eventcore/drivers/posix/sockets.d | 27 ++++++++++++++++++----- source/eventcore/drivers/winapi/sockets.d | 5 +++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/source/eventcore/driver.d b/source/eventcore/driver.d index 7747cde..460f02e 100644 --- a/source/eventcore/driver.d +++ b/source/eventcore/driver.d @@ -127,6 +127,10 @@ interface EventDriverSockets { */ StreamSocketFD connectStream(scope Address peer_address, scope Address bind_address, ConnectCallback on_connect); + /** Aborts asynchronous connect by closing the socket. + */ + void cancelConnectStream(StreamSocketFD sock); + /** Adopts an existing stream socket. The given socket must be in a connected state. It will be automatically @@ -553,7 +557,8 @@ enum ConnectStatus { refused, timeout, bindFailure, - unknownError + unknownError, + cancelled } enum ConnectionState { diff --git a/source/eventcore/drivers/libasync.d b/source/eventcore/drivers/libasync.d index c98c21a..b8e9332 100644 --- a/source/eventcore/drivers/libasync.d +++ b/source/eventcore/drivers/libasync.d @@ -89,6 +89,11 @@ final class LibasyncEventDriverSockets : EventDriverSockets { assert(false, "TODO!"); } + override void cancelConnectStream(StreamSocketFD sock) + { + assert(false, "TODO!"); + } + override StreamSocketFD adoptStream(int socket) { assert(false, "TODO!"); diff --git a/source/eventcore/drivers/posix/sockets.d b/source/eventcore/drivers/posix/sockets.d index 59d86e6..9cd9e5f 100644 --- a/source/eventcore/drivers/posix/sockets.d +++ b/source/eventcore/drivers/posix/sockets.d @@ -95,7 +95,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets m_loop.registerFD(sock, EventMask.read|EventMask.write|EventMask.status); m_loop.m_fds[sock].specific = StreamSocketSlot.init; m_loop.setNotifyCallback!(EventType.status)(sock, &onConnectError); - releaseRef(sock); // setNotifyCallback adds a reference, but waiting for status/disconnect should not affect the ref count + releaseRef(sock); // onConnectError callback is weak reference auto ret = () @trusted { return connect(cast(sock_t)sock, address.name, address.nameLen); } (); if (ret == 0) { @@ -113,14 +113,32 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets m_loop.clearFD(sock); m_loop.unregisterFD(sock, EventMask.read|EventMask.write|EventMask.status); invalidateSocket(); - on_connect(sock, ConnectStatus.unknownError); - return sock; + on_connect(StreamSocketFD.invalid, ConnectStatus.unknownError); + return StreamSocketFD.invalid; } } return sock; } + final override void cancelConnectStream(StreamSocketFD sock) + { + assert(sock != StreamSocketFD.invalid, "Invalid socket descriptor"); + with (m_loop.m_fds[sock].streamSocket) + { + assert(state == ConnectionState.connecting, + "Unable to cancel connect on the socket that is not in connecting state"); + state = ConnectionState.closed; + auto cb = connectCallback; + connectCallback = null; + m_loop.clearFD(sock); + m_loop.unregisterFD(sock, EventMask.read|EventMask.write|EventMask.status); + closeSocket(cast(sock_t)sock.value); + if (cb) + cb(StreamSocketFD.invalid, ConnectStatus.cancelled); + } + } + final override StreamSocketFD adoptStream(int socket) { auto fd = StreamSocketFD(socket); @@ -226,7 +244,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets m_loop.m_fds[fd].streamSocket.state = ConnectionState.connected; m_loop.registerFD(fd, EventMask.read|EventMask.write|EventMask.status); m_loop.setNotifyCallback!(EventType.status)(fd, &onConnectError); - releaseRef(fd); // setNotifyCallback adds a reference, but waiting for status/disconnect should not affect the ref count + releaseRef(fd); // onConnectError callback is weak reference //print("accept %d", sockfd); scope RefAddress addrc = new RefAddress(() @trusted { return cast(sockaddr*)&addr; } (), addr_len); m_loop.m_fds[listenfd].streamListen.acceptCallback(cast(StreamListenSocketFD)listenfd, fd, addrc); @@ -889,4 +907,3 @@ private int getSocketError() version (Windows) return WSAGetLastError(); else return errno; } - diff --git a/source/eventcore/drivers/winapi/sockets.d b/source/eventcore/drivers/winapi/sockets.d index 5c93cc6..7015df0 100644 --- a/source/eventcore/drivers/winapi/sockets.d +++ b/source/eventcore/drivers/winapi/sockets.d @@ -82,6 +82,11 @@ final class WinAPIEventDriverSockets : EventDriverSockets { } } + final override void cancelConnectStream(StreamSocketFD sock) + { + assert(false, "Not implemented"); + } + override StreamSocketFD adoptStream(int socket) { return adoptStreamInternal(socket); From 36b0413d32219a78d20c7bac1225e86b043cdd46 Mon Sep 17 00:00:00 2001 From: Boris-Barboris Date: Sat, 11 Nov 2017 15:44:13 +0000 Subject: [PATCH 2/2] remove cabblack invocation --- source/eventcore/driver.d | 3 +-- source/eventcore/drivers/posix/sockets.d | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/eventcore/driver.d b/source/eventcore/driver.d index 460f02e..c05181b 100644 --- a/source/eventcore/driver.d +++ b/source/eventcore/driver.d @@ -557,8 +557,7 @@ enum ConnectStatus { refused, timeout, bindFailure, - unknownError, - cancelled + unknownError } enum ConnectionState { diff --git a/source/eventcore/drivers/posix/sockets.d b/source/eventcore/drivers/posix/sockets.d index 9cd9e5f..f6611ac 100644 --- a/source/eventcore/drivers/posix/sockets.d +++ b/source/eventcore/drivers/posix/sockets.d @@ -129,13 +129,10 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets assert(state == ConnectionState.connecting, "Unable to cancel connect on the socket that is not in connecting state"); state = ConnectionState.closed; - auto cb = connectCallback; connectCallback = null; m_loop.clearFD(sock); m_loop.unregisterFD(sock, EventMask.read|EventMask.write|EventMask.status); closeSocket(cast(sock_t)sock.value); - if (cb) - cb(StreamSocketFD.invalid, ConnectStatus.cancelled); } }