RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 11:35:07 +00:00
Code Issues Activity Actions

Kernel: Report EAGAIN from read() on a non-blocking socket if the buffer is empty

Browse source 
This is not EOF, and never should have been so -- can trip up other code
when porting.

Also updates LibGUI and WindowServer which both relied on the old
behaviour (and didn't work without changes). There may be others, but I
didn't run into them with a quick inspection.
This commit is contained in:
Robin Burchell 2019-05-20 01:18:33 +02:00 • committed by Andreas Kling
parent 40a5eb4e6e
commit a8864dc590
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
LibGUI/GEventLoop.cpp
View file

@ -324,22 +324,22 @@ void GEventLoop::process_unprocessed_bundles()
bool GEventLoop::drain_messages_from_server()
{
bool is_first_pass = true;
for (;;) {
WSAPI_ServerMessage message;
ssize_t nread = read(s_windowserver_fd, &message, sizeof(WSAPI_ServerMessage));
if (nread < 0) {
if (errno == EAGAIN) {
return true;
}
perror("read");
quit(1);
return false;
}
if (nread == 0) {
if (is_first_pass) {
fprintf(stderr, "EOF on WindowServer fd\n");
quit(1);
return false;
}
return true;
fprintf(stderr, "EOF on WindowServer fd\n");
quit(1);
exit(-1);
return false;
}
assert(nread == sizeof(message));
ByteBuffer extra_data;
@ -355,7 +355,6 @@ bool GEventLoop::drain_messages_from_server()
ASSERT(extra_nread == message.extra_size);
}
m_unprocessed_bundles.append({ move(message), move(extra_data) });
is_first_pass = false;
}
}