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

wait4(): support for ECHILD error check

Browse Source
This commit is contained in:
Balazs Gerofi bgerofi@riken.jp
2014-05-13 10:28:27 +09:00
parent 426c67861c
commit ac65e6c869
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/syscall.c
View File

@@ -276,6 +276,7 @@ SYSCALL_DECLARE(wait4)
int options = (int)ihk_mc_syscall_arg2(ctx); int options = (int)ihk_mc_syscall_arg2(ctx);
int ret; int ret;
struct waitq_entry waitpid_wqe; struct waitq_entry waitpid_wqe;
int empty = 1;
rescan: rescan:
child = NULL; child = NULL;
@@ -284,6 +285,9 @@ rescan:
ihk_mc_spinlock_lock_noirq(&proc->ftn->lock); ihk_mc_spinlock_lock_noirq(&proc->ftn->lock);
list_for_each_entry(child_iter, &proc->ftn->children, siblings_list) { list_for_each_entry(child_iter, &proc->ftn->children, siblings_list) {
empty = 0;
ihk_mc_spinlock_lock_noirq(&child_iter->lock); ihk_mc_spinlock_lock_noirq(&child_iter->lock);
if (child_iter->status == PS_ZOMBIE if (child_iter->status == PS_ZOMBIE
@@ -296,6 +300,11 @@ rescan:
ihk_mc_spinlock_unlock_noirq(&child_iter->lock); ihk_mc_spinlock_unlock_noirq(&child_iter->lock);
} }
if (empty) {
ihk_mc_spinlock_unlock_noirq(&proc->ftn->lock);
return ECHILD;
}
if (child) { if (child) {
struct syscall_request request IHK_DMA_ALIGN; struct syscall_request request IHK_DMA_ALIGN;