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

WindowServer+LibGUI: Wait for the extra_data to arrive.

Browse source 
Since the sockets we use are non-blocking, just slap a select before the
second call to read(). This fixes some flakiness seen under load.

This should eventually work a bit differently, we could use recv() once
it has MSG_WAITALL, and we should not let WindowServer handle all the
client connections on the main thread. But for now, this works.

Fixes #24.
This commit is contained in:
Andreas Kling 2019-05-01 18:25:24 +02:00
parent ded3652f6c
commit 288e97a206
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
LibGUI/GEventLoop.cpp
View file

@ -341,6 +341,12 @@ bool GEventLoop::drain_messages_from_server()
ByteBuffer extra_data; ByteBuffer extra_data;
if (message.extra_size) { if (message.extra_size) {
extra_data = ByteBuffer::create_uninitialized(message.extra_size); extra_data = ByteBuffer::create_uninitialized(message.extra_size);
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(s_event_fd, &rfds);
struct timeval timeout { 1, 0 };
int rc = select(s_event_fd + 1, &rfds, nullptr, nullptr, &timeout);
ASSERT(rc == 1);
int extra_nread = read(s_event_fd, extra_data.data(), extra_data.size()); int extra_nread = read(s_event_fd, extra_data.data(), extra_data.size());
ASSERT(extra_nread == message.extra_size); ASSERT(extra_nread == message.extra_size);
} }

11
Servers/WindowServer/WSEventLoop.cpp
View file

@ -309,6 +309,17 @@ void WSEventLoop::drain_client(WSClientConnection& client)
} }
extra_data = ByteBuffer::create_uninitialized(message.extra_size); extra_data = ByteBuffer::create_uninitialized(message.extra_size);
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(client.fd(), &rfds);
struct timeval timeout { 1, 0 };
int rc = select(client.fd() + 1, &rfds, nullptr, nullptr, &timeout);
if (rc != 1) {
dbgprintf("extra_data didn't show up in time\n");
return client.did_misbehave();
}
int extra_nread = read(client.fd(), extra_data.data(), extra_data.size()); int extra_nread = read(client.fd(), extra_data.data(), extra_data.size());
if (extra_nread != message.extra_size) { if (extra_nread != message.extra_size) {
dbgprintf("extra_nread(%d) != extra_size(%d)\n", extra_nread, extra_data.size()); dbgprintf("extra_nread(%d) != extra_size(%d)\n", extra_nread, extra_data.size());