debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #28 from Boris-Barboris/connect_cancel

Browse source 
cancelConnectStream for Posix
merged-on-behalf-of: Sönke Ludwig <s-ludwig@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-11-11 16:57:28 +01:00 committed by GitHub
parent 8d7c1e3c96 36b0413d32
commit f146fa01f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/eventcore/driver.d
View file

@ -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

5
source/eventcore/drivers/libasync.d
View file

@ -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!");

24
source/eventcore/drivers/posix/sockets.d
View file

@ -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,29 @@ 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;
connectCallback = null;
m_loop.clearFD(sock);
m_loop.unregisterFD(sock, EventMask.read|EventMask.write|EventMask.status);
closeSocket(cast(sock_t)sock.value);
}
}
final override StreamSocketFD adoptStream(int socket)
{
auto fd = StreamSocketFD(socket);
@ -226,7 +241,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 +904,3 @@ private int getSocketError()
version (Windows) return WSAGetLastError();
else return errno;
}

5
source/eventcore/drivers/winapi/sockets.d
View file

@ -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);