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

Kernel: Don't disable interrupts during Process destruction.

Browse source
This commit is contained in:
Andreas Kling 2019-03-27 14:38:32 +01:00
parent 1592612a60
commit a2fe5f8517
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Kernel/Process.cpp
View file

@ -1286,20 +1286,23 @@ mode_t Process::sys$umask(mode_t mask)
int Process::reap(Process& process) int Process::reap(Process& process)
{ {
InterruptDisabler disabler; int exit_status;
int exit_status = (process.m_termination_status << 8) | process.m_termination_signal; {
InterruptDisabler disabler;
exit_status = (process.m_termination_status << 8) | process.m_termination_signal;
if (process.ppid()) { if (process.ppid()) {
auto* parent = Process::from_pid(process.ppid()); auto* parent = Process::from_pid(process.ppid());
if (parent) { if (parent) {
parent->m_ticks_in_user_for_dead_children += process.m_ticks_in_user + process.m_ticks_in_user_for_dead_children; parent->m_ticks_in_user_for_dead_children += process.m_ticks_in_user + process.m_ticks_in_user_for_dead_children;
parent->m_ticks_in_kernel_for_dead_children += process.m_ticks_in_kernel + process.m_ticks_in_kernel_for_dead_children; parent->m_ticks_in_kernel_for_dead_children += process.m_ticks_in_kernel + process.m_ticks_in_kernel_for_dead_children;
}
} }
}
dbgprintf("reap: %s(%u) {%s}\n", process.name().characters(), process.pid(), to_string(process.state())); dbgprintf("reap: %s(%u) {%s}\n", process.name().characters(), process.pid(), to_string(process.state()));
ASSERT(process.is_dead()); ASSERT(process.is_dead());
g_processes->remove(&process); g_processes->remove(&process);
}
delete &process; delete &process;
return exit_status; return exit_status;
} }