Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ptrace: Inform non-parent tracer when tracee exits

Browse Source
This commit is contained in:
K. Lange 2021-09-25 07:16:47 +09:00
parent aa8fdab570
commit 0caa949550
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/sys/process.c
View File

@ -1000,7 +1000,7 @@ int waitpid(int pid, int * status, int options) {
process_t * child = node->value; process_t * child = node->value;
if (wait_candidate(proc,pid,options,child)) { if (wait_candidate(proc,pid,options,child)) {
has_children = 1; has_children = 1;
if (child->flags & PROC_FLAG_SUSPENDED) { if (child->flags & (PROC_FLAG_SUSPENDED | PROC_FLAG_FINISHED)) {
candidate = child; candidate = child;
break; break;
} }
@ -1257,12 +1257,22 @@ void task_exit(int retval) {
process_t * parent = process_get_parent((process_t *)this_core->current_process); process_t * parent = process_get_parent((process_t *)this_core->current_process);
__sync_or_and_fetch(&this_core->current_process->flags, PROC_FLAG_FINISHED); __sync_or_and_fetch(&this_core->current_process->flags, PROC_FLAG_FINISHED);
if (this_core->current_process->tracer) {
process_t * tracer = process_from_pid(this_core->current_process->tracer);
if (tracer && tracer != parent) {
spin_lock(tracer->wait_lock);
wakeup_queue(tracer->wait_queue);
spin_unlock(tracer->wait_lock);
}
}
if (parent && !(parent->flags & PROC_FLAG_FINISHED)) { if (parent && !(parent->flags & PROC_FLAG_FINISHED)) {
spin_lock(parent->wait_lock); spin_lock(parent->wait_lock);
send_signal(parent->group, SIGCHLD, 1); send_signal(parent->group, SIGCHLD, 1);
wakeup_queue(parent->wait_queue); wakeup_queue(parent->wait_queue);
spin_unlock(parent->wait_lock); spin_unlock(parent->wait_lock);
} }
switch_next(); switch_next();
} }