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

Fix bug where a signal-interrupted waitpid() wouldn't return EINTR.

Browse source
This commit is contained in:
Andreas Kling 2018-11-28 23:30:06 +01:00
parent 464a16afa2
commit f5a83c4d8a
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Scheduler.cpp
View file

@ -38,8 +38,8 @@ bool Scheduler::pick_next()
process.for_each_child([&process] (Process& child) {
if (child.state() != Process::Dead)
return true;
if (process.waitee() == -1 || process.waitee() == child.pid()) {
process.m_waitee = child.pid();
if (process.waitee_pid() == -1 || process.waitee_pid() == child.pid()) {
process.m_waitee_pid = child.pid();
process.unblock();
return false;
}
@ -99,9 +99,12 @@ bool Scheduler::pick_next()
// syscall effectively being "interrupted" despite having completed?
if (process.in_kernel() && !process.is_blocked())
return true;
// NOTE: dispatch_one_pending_signal() may unblock the process.
bool was_blocked = process.is_blocked();
if (!process.dispatch_one_pending_signal())
return true;
if (process.is_blocked()) {
if (was_blocked) {
dbgprintf("Unblock %s(%u) due to signal\n", process.name().characters(), process.pid());
process.m_was_interrupted_while_blocked = true;
process.unblock();
}