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

Kernel: Add a new block state for accept() on a blocking socket

Browse source 
Rather than asserting, which really ruins everyone's day.
This commit is contained in:
Robin Burchell 2019-07-18 10:39:00 +02:00 • committed by Andreas Kling
parent 79a6312c8f
commit f2fdac789c
4 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Process.cpp
View file

@ -2120,8 +2120,13 @@ int Process::sys$accept(int accepting_socket_fd, sockaddr* address, socklen_t* a
return -ENOTSOCK;
auto& socket = *accepting_socket_description->socket();
if (!socket.can_accept()) {
ASSERT(!accepting_socket_description->is_blocking());
return -EAGAIN;
if (accepting_socket_description->is_blocking()) {
current->block(Thread::State::BlockedAccept, *accepting_socket_description);
if (current->m_was_interrupted_while_blocked)
return -EINTR;
} else {
return -EAGAIN;
}
}
auto accepted_socket = socket.accept();
ASSERT(accepted_socket);