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

Kernel: Consolidate timeout logic

Browse source 
Allow passing in an optional timeout to Thread::block and move
the timeout check out of Thread::Blocker. This way all Blockers
implicitly support timeouts and don't need to implement it
themselves. Do however allow them to override timeouts (e.g.
for sockets).
This commit is contained in:
Tom 2020-08-03 09:43:19 -06:00 • committed by Andreas Kling
parent df52061cdb
commit f4a5c9b6c2
15 changed files with 60 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Net/IPv4Socket.cpp
View file

@ -246,7 +246,7 @@ ssize_t IPv4Socket::receive_byte_buffered(FileDescription& description, void* bu
return -EAGAIN;
locker.unlock();
auto res = Thread::current()->block<Thread::ReadBlocker>(description);
auto res = Thread::current()->block<Thread::ReadBlocker>(nullptr, description);
locker.lock();
if (!m_can_read) {
@ -296,7 +296,7 @@ ssize_t IPv4Socket::receive_packet_buffered(FileDescription& description, void*
}
locker.unlock();
auto res = Thread::current()->block<Thread::ReadBlocker>(description);
auto res = Thread::current()->block<Thread::ReadBlocker>(nullptr, description);
locker.lock();
if (!m_can_read) {