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

Use asyncAwaitAny instead of asyncAwait to work around linker error.

Browse source
This commit is contained in:
Sönke Ludwig 2017-11-22 16:52:46 +01:00
parent 6634cbc645
commit 2625397f91
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/vibe/core/net.d
View file

@ -195,18 +195,26 @@ TCPConnection connectTCP(NetworkAddress addr, NetworkAddress bind_address = anyA
scope uaddr = new RefAddress(addr.sockAddr, addr.sockAddrLen); scope uaddr = new RefAddress(addr.sockAddr, addr.sockAddrLen);
scope baddr = new RefAddress(bind_address.sockAddr, bind_address.sockAddrLen); scope baddr = new RefAddress(bind_address.sockAddr, bind_address.sockAddrLen);
auto result = asyncAwait!(ConnectCallback, bool cancelled;
StreamSocketFD sock;
ConnectStatus status;
alias waiter = Waitable!(ConnectCallback,
cb => eventDriver.sockets.connectStream(uaddr, baddr, cb), cb => eventDriver.sockets.connectStream(uaddr, baddr, cb),
(ConnectCallback cb, StreamSocketFD sock_fd) { (ConnectCallback cb, StreamSocketFD sock_fd) {
cancelled = true;
eventDriver.sockets.cancelConnectStream(sock_fd); eventDriver.sockets.cancelConnectStream(sock_fd);
} },
)(timeout); (fd, st) { sock = fd; status = st; }
);
enforce(result.completed, "Failed to connect to " ~ addr.toString() ~ asyncAwaitAny!(true, waiter)(timeout);
enforce(!cancelled, "Failed to connect to " ~ addr.toString() ~
": timeout"); ": timeout");
enforce(result.results[1] == ConnectStatus.connected, "Failed to connect to "~addr.toString()~": "~result.results[1].to!string); enforce(status == ConnectStatus.connected, "Failed to connect to "~addr.toString()~": "~status.to!string);
return TCPConnection(result.results[0], uaddr); return TCPConnection(sock, uaddr);
} (); } ();
} }