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

temporary fix for waiting tracee blocked

Browse Source
This commit is contained in:
Tomoki Shirasawa
2015-02-24 15:20:32 +09:00
parent c1c1fd578a
commit 73743eeeb0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/syscall.c
View File

@ -472,24 +472,24 @@ do_wait(int pid, int *status, int options, void *rusage)
if((options & WEXITED) && if((options & WEXITED) &&
child_iter->status == PS_ZOMBIE) { child_iter->status == PS_ZOMBIE) {
ret = wait_zombie(proc, child_iter, status, options); ret = wait_zombie(proc, child_iter, status, options);
if(ret == child_iter->pid) { // if(ret == child_iter->pid) {
if(!(options & WNOWAIT)){ if(!(options & WNOWAIT)){
list_del(&child_iter->ptrace_siblings_list); list_del(&child_iter->ptrace_siblings_list);
release_fork_tree_node(child_iter); release_fork_tree_node(child_iter);
} }
goto out_found; goto out_found;
} // }
} }
if(child_iter->status & (PS_STOPPED | PS_TRACED)) { if(child_iter->status & (PS_STOPPED | PS_TRACED)) {
/* ptraced and in stopped or trace-stopped state */ /* ptraced and in stopped or trace-stopped state */
ret = wait_stopped(proc, child_iter, status, options); ret = wait_stopped(proc, child_iter, status, options);
if(ret == child_iter->pid) { // if(ret == child_iter->pid) {
if(!(options & WNOWAIT)){ if(!(options & WNOWAIT)){
child_iter->signal_flags &= ~SIGNAL_STOP_STOPPED; child_iter->signal_flags &= ~SIGNAL_STOP_STOPPED;
} }
goto out_found; goto out_found;
} // }
} else { } else {
/* ptraced and in running or sleeping state */ /* ptraced and in running or sleeping state */
} }
@ -497,12 +497,12 @@ do_wait(int pid, int *status, int options, void *rusage)
if((child_iter->signal_flags & SIGNAL_STOP_CONTINUED) && if((child_iter->signal_flags & SIGNAL_STOP_CONTINUED) &&
(options & WCONTINUED)) { (options & WCONTINUED)) {
ret = wait_continued(proc, child_iter, status, options); ret = wait_continued(proc, child_iter, status, options);
if(ret == child_iter->pid) { // if(ret == child_iter->pid) {
if(!(options & WNOWAIT)){ if(!(options & WNOWAIT)){
child_iter->signal_flags &= ~SIGNAL_STOP_CONTINUED; child_iter->signal_flags &= ~SIGNAL_STOP_CONTINUED;
} }
goto out_found; goto out_found;
} // }
} }
} }
@ -2620,6 +2620,8 @@ SYSCALL_DECLARE(setrlimit)
switch(resource){ switch(resource){
case RLIMIT_FSIZE: case RLIMIT_FSIZE:
case RLIMIT_NOFILE: case RLIMIT_NOFILE:
case RLIMIT_LOCKS:
case RLIMIT_MSGQUEUE:
rc = syscall_generic_forwarding(__NR_setrlimit, ctx); rc = syscall_generic_forwarding(__NR_setrlimit, ctx);
if(rc < 0) if(rc < 0)
return rc; return rc;