0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Let reap() communicate the dead process's exit status to the caller.

Browse source 
This way the scheduler doesn't need to plumb the exit status into the waiter.
We still plumb the waitee pid though, I don't love it but it can be fixed.
This commit is contained in:
Andreas Kling 2018-11-28 22:01:24 +01:00
parent 938d1b8bfb
commit d90104f9e0
Notes: sideshowbarker 2024-07-19 16:09:33 +09:00
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AK/Compiler.h
View file

@ -7,4 +7,4 @@
#define NEVER_INLINE __attribute__ ((noinline)) #define NEVER_INLINE __attribute__ ((noinline))
#define MALLOC_ATTR __attribute__ ((malloc)) #define MALLOC_ATTR __attribute__ ((malloc))
#define PURE __attribute__ ((pure)) #define PURE __attribute__ ((pure))
#define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))

18
Kernel/Process.cpp
View file

@ -1411,13 +1411,15 @@ mode_t Process::sys$umask(mode_t mask)
return old_mask; return old_mask;
} }
void Process::reap(Process& process) int Process::reap(Process& process)
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
int exit_status = (process.m_termination_status << 8) | process.m_termination_signal;
dbgprintf("reap: %s(%u) {%s}\n", process.name().characters(), process.pid(), toString(process.state())); dbgprintf("reap: %s(%u) {%s}\n", process.name().characters(), process.pid(), toString(process.state()));
ASSERT(process.state() == Dead); ASSERT(process.state() == Dead);
g_processes->remove(&process); g_processes->remove(&process);
delete &process; delete &process;
return exit_status;
} }
pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options) pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options)
@ -1429,6 +1431,9 @@ pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options)
if (!validate_write_typed(wstatus)) if (!validate_write_typed(wstatus))
return -EFAULT; return -EFAULT;
int dummy_wstatus;
int& exit_status = wstatus ? *wstatus : dummy_wstatus;
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
if (waitee != -1 && !Process::from_pid(waitee)) if (waitee != -1 && !Process::from_pid(waitee))
@ -1439,10 +1444,10 @@ pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options)
if (waitee == -1) { if (waitee == -1) {
pid_t reaped_pid = 0; pid_t reaped_pid = 0;
InterruptDisabler disabler; InterruptDisabler disabler;
for_each_child([&reaped_pid] (Process& process) { for_each_child([&reaped_pid, &exit_status] (Process& process) {
if (process.state() == Dead) { if (process.state() == Dead) {
reaped_pid = process.pid(); reaped_pid = process.pid();
reap(process); exit_status = reap(process);
} }
return true; return true;
}); });
@ -1452,7 +1457,7 @@ pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options)
if (!waitee_process) if (!waitee_process)
return -ECHILD; return -ECHILD;
if (waitee_process->state() == Dead) { if (waitee_process->state() == Dead) {
reap(*waitee_process); exit_status = reap(*waitee_process);
return waitee; return waitee;
} }
return 0; return 0;
@ -1460,7 +1465,6 @@ pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options)
} }
m_waitee = waitee; m_waitee = waitee;
m_waitee_status = 0;
block(BlockedWait); block(BlockedWait);
sched_yield(); sched_yield();
if (m_was_interrupted_while_blocked) if (m_was_interrupted_while_blocked)
@ -1473,9 +1477,7 @@ pid_t Process::sys$waitpid(pid_t waitee, int* wstatus, int options)
waitee_process = Process::from_pid(m_waitee); waitee_process = Process::from_pid(m_waitee);
} }
ASSERT(waitee_process); ASSERT(waitee_process);
reap(*waitee_process); exit_status = reap(*waitee_process);
if (wstatus)
*wstatus = m_waitee_status;
return m_waitee; return m_waitee;
} }

3
Kernel/Process.h
View file

@ -177,7 +177,7 @@ public:
static void initialize(); static void initialize();
void crash() NORETURN; void crash() NORETURN;
static void reap(Process&); static int reap(Process&) WARN_UNUSED_RESULT;
const TTY* tty() const { return m_tty; } const TTY* tty() const { return m_tty; }
@ -267,7 +267,6 @@ private:
void* m_kernelStack { nullptr }; void* m_kernelStack { nullptr };
dword m_timesScheduled { 0 }; dword m_timesScheduled { 0 };
pid_t m_waitee { -1 }; pid_t m_waitee { -1 };
int m_waitee_status { 0 };
int m_fdBlockedOnRead { -1 }; int m_fdBlockedOnRead { -1 };
int m_blocked_fd { -1 }; int m_blocked_fd { -1 };
size_t m_max_open_file_descriptors { 16 }; size_t m_max_open_file_descriptors { 16 };

9
Kernel/Scheduler.cpp
View file

@ -39,7 +39,6 @@ bool Scheduler::pick_next()
if (child.state() != Process::Dead) if (child.state() != Process::Dead)
return true; return true;
if (process.waitee() == -1 || process.waitee() == child.pid()) { if (process.waitee() == -1 || process.waitee() == child.pid()) {
process.m_waitee_status = (child.m_termination_status << 8) | child.m_termination_signal;
process.m_waitee = child.pid(); process.m_waitee = child.pid();
process.unblock(); process.unblock();
return false; return false;
@ -75,8 +74,12 @@ bool Scheduler::pick_next()
} }
if (process.state() == Process::Dead) { if (process.state() == Process::Dead) {
if (current != &process && !Process::from_pid(process.ppid())) if (current != &process && !Process::from_pid(process.ppid())) {
Process::reap(process); auto name = process.name();
auto pid = process.pid();
auto exit_status = Process::reap(process);
kprintf("reaped unparented process %s(%u), exit status: %u\n", name.characters(), pid, exit_status);
}
return true; return true;
} }