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

Implement proper zero size wait semantics for Posix stream sockets.

Browse source
This commit is contained in:
Sönke Ludwig 2017-01-22 10:47:58 +01:00
parent ca81d25645
commit 58c89a7369
2 changed files with 75 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/eventcore/drivers/posix.d
View file

@ -399,10 +399,10 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
final override void read(StreamSocketFD socket, ubyte[] buffer, IOMode mode, IOCallback on_read_finish)
{
if (buffer.length == 0) {
/*if (buffer.length == 0) {
on_read_finish(socket, IOStatus.ok, 0);
return;
}
}*/
sizediff_t ret;
() @trusted { ret = .recv(socket, buffer.ptr, buffer.length, 0); } ();
@ -417,11 +417,13 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
}
if (ret == 0) {
print("disconnect");
on_read_finish(socket, IOStatus.disconnected, 0);
return;
}
if (ret < 0 && mode == IOMode.immediate) {
print("wouldblock");
on_read_finish(socket, IOStatus.wouldBlock, 0);
return;
}
@ -469,8 +471,9 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
slot.readCallback(socket, status, slot.bytesRead);
}
sizediff_t ret;
() @trusted { ret = .recv(socket, slot.readBuffer.ptr, slot.readBuffer.length, 0); } ();
sizediff_t ret = 0;
if (!slot.readBuffer.length)
() @trusted { ret = .recv(socket, slot.readBuffer.ptr, slot.readBuffer.length, 0); } ();
if (ret < 0) {
auto err = getSocketError();
if (!err.among!(EAGAIN, EINPROGRESS)) {
@ -479,13 +482,13 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
}
}
if (ret == 0) {
if (ret == 0 && slot.readBuffer.length) {
slot.state = ConnectionState.passiveClose;
finalize(IOStatus.disconnected);
return;
}
if (ret > 0) {
if (ret > 0 || !slot.readBuffer.length) {
slot.bytesRead += ret;
slot.readBuffer = slot.readBuffer[ret .. $];
if (slot.readMode != IOMode.all || slot.readBuffer.length == 0) {