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

Userspace: Deal with select() returning EINTR on a signal interruption

Browse source 
Add a trivial CSafeSyscall template that calls a callback until it stops
returning EINTR, and use it everywhere we use select() now.

Thanks to Andreas for the suggestion of using a template parameter for
the syscall function to invoke.
This commit is contained in:
Robin Burchell 2019-07-21 13:46:53 +02:00 • committed by Andreas Kling
parent a1eff3daba
commit f2c0e55070
5 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Libraries/LibCore/CEventLoop.cpp
View file

@ -4,6 +4,7 @@
#include <LibCore/CLock.h>
#include <LibCore/CNotifier.h>
#include <LibCore/CObject.h>
#include <LibCore/CSyscallUtils.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
@ -203,11 +204,7 @@ void CEventLoop::wait_for_event(WaitMode mode)
should_wait_forever = false;
}
int marked_fd_count = select(max_fd + 1, &rfds, &wfds, nullptr, should_wait_forever ? nullptr : &timeout);
if (marked_fd_count < 0) {
ASSERT_NOT_REACHED();
}
int marked_fd_count = CSyscallUtils::safe_syscall(select, max_fd + 1, &rfds, &wfds, nullptr, should_wait_forever ? nullptr : &timeout);
if (FD_ISSET(s_wake_pipe_fds[0], &rfds)) {
char buffer[32];
auto nread = read(s_wake_pipe_fds[0], buffer, sizeof(buffer));