gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wait4(): do not return ECHILD when child exists but not in PS_ZOMBIE state yet

Browse Source
This commit is contained in:
bgerofi@riken.jp
2014-09-05 18:28:15 +09:00
committed by Balazs Gerofi bgerofi@riken.jp
parent efc817de92
commit 0de6a30426
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
kernel/syscall.c
View File

@@ -326,46 +326,50 @@ rescan:
ihk_mc_spinlock_lock_noirq(&child_iter->lock); ihk_mc_spinlock_lock_noirq(&child_iter->lock);
if (child_iter->status == PS_ZOMBIE if (pid == -1 || pid == child_iter->pid) {
&& (pid == -1 || pid == child_iter->pid)) {
child = child_iter; child = child_iter;
ihk_mc_spinlock_unlock_noirq(&child_iter->lock);
break; break;
} }
ihk_mc_spinlock_unlock_noirq(&child_iter->lock); ihk_mc_spinlock_unlock_noirq(&child_iter->lock);
} }
if (empty || (!child && pid != -1)) { if (empty || (!child && pid != -1)) {
ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock); ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock);
return -ECHILD; return -ECHILD;
} }
/* If child is valid we are still holding its ftn->lock */
if (child) { if (child) {
struct syscall_request request IHK_DMA_ALIGN; if (child->status == PS_ZOMBIE) {
struct syscall_request request IHK_DMA_ALIGN;
dkprintf("wait: found PS_ZOMBIE process: %d\n", child->pid); ihk_mc_spinlock_unlock_noirq(&child->lock);
dkprintf("wait: found PS_ZOMBIE process: %d\n", child->pid);
list_del(&child->siblings_list);
ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock); list_del(&child->siblings_list);
ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock);
if (status) {
*status = child->exit_status; if (status) {
*status = child->exit_status;
}
pid = child->pid;
release_fork_tree_node(child);
/* Ask host to clean up exited child */
request.number = __NR_wait4;
request.args[0] = pid;
request.args[1] = 0;
ret = do_syscall(&request, ctx, ihk_mc_get_processor_id(), 0);
if (ret != pid)
kprintf("WARNING: host waitpid failed?\n");
goto exit;
} }
pid = child->pid;
release_fork_tree_node(child); ihk_mc_spinlock_unlock_noirq(&child->lock);
/* Ask host to clean up exited child */
request.number = __NR_wait4;
request.args[0] = pid;
request.args[1] = 0;
ret = do_syscall(&request, ctx, ihk_mc_get_processor_id(), 0);
if (ret != pid)
kprintf("WARNING: host waitpid failed?\n");
goto exit;
} }
/* Don't sleep if WNOHANG requested */ /* Don't sleep if WNOHANG requested */