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

bug fix 'GDB: missing parent-child relationship'

Browse Source 
refs #641
This commit is contained in:
Tomoki Shirasawa
2015-10-30 15:06:27 +09:00
parent 0eaa27291a
commit 9e3b0b5866
1 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
kernel/syscall.c
View File

@@ -392,13 +392,11 @@ do_wait(int pid, int *status, int options, void *rusage)
if((options & WEXITED) &&
child->status == PS_ZOMBIE) {
ret = wait_zombie(thread, child, status, options);
if(ret == child->pid){
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
if(!(options & WNOWAIT)){
release_process(child);
}
goto out_found;
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
if(!(options & WNOWAIT)){
release_process(child);
}
goto out_found;
}
if(!(child->ptrace & PT_TRACED) &&
@@ -406,37 +404,31 @@ do_wait(int pid, int *status, int options, void *rusage)
(options & WUNTRACED)) {
/* Not ptraced and in stopped state and WUNTRACED is specified */
ret = wait_stopped(thread, child, status, options);
if(ret == child->pid){
if(!(options & WNOWAIT)){
child->signal_flags &= ~SIGNAL_STOP_STOPPED;
}
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
goto out_found;
if(!(options & WNOWAIT)){
child->signal_flags &= ~SIGNAL_STOP_STOPPED;
}
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
goto out_found;
}
if((child->ptrace & PT_TRACED) &&
(child->status & (PS_STOPPED | PS_TRACED))) {
ret = wait_stopped(thread, child, status, options);
if(ret == child->pid){
if(!(options & WNOWAIT)){
child->signal_flags &= ~SIGNAL_STOP_STOPPED;
}
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
goto out_found;
if(!(options & WNOWAIT)){
child->signal_flags &= ~SIGNAL_STOP_STOPPED;
}
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
goto out_found;
}
if((child->signal_flags & SIGNAL_STOP_CONTINUED) &&
(options & WCONTINUED)) {
ret = wait_continued(thread, child, status, options);
if(ret == child->pid){
if(!(options & WNOWAIT)){
child->signal_flags &= ~SIGNAL_STOP_CONTINUED;
}
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
goto out_found;
if(!(options & WNOWAIT)){
child->signal_flags &= ~SIGNAL_STOP_CONTINUED;
}
mcs_rwlock_writer_unlock_noirq(&thread->proc->children_lock, &lock);
goto out_found;
}
}
@@ -1624,7 +1616,7 @@ static int ptrace_report_clone(struct thread *thread, struct thread *new, int ev
new->proc->parent = thread->proc->parent; /* new ptracing parent */
mcs_rwlock_writer_lock_noirq(&new->proc->parent->children_lock, &lock);
list_add_tail(&new->siblings_list, &new->proc->parent->children_list);
list_add_tail(&new->proc->siblings_list, &new->proc->parent->children_list);
mcs_rwlock_writer_unlock_noirq(&new->proc->parent->children_lock, &lock);
/* trace and SIGSTOP */
@@ -1924,13 +1916,6 @@ unsigned long do_fork(int clone_flags, unsigned long newsp,
ihk_mc_syscall_ret(new->uctx) = 0;
if (cpu_local_var(current)->proc->ptrace) {
ptrace_event = ptrace_check_clone_event(cpu_local_var(current), clone_flags);
if (ptrace_event) {
ptrace_report_clone(cpu_local_var(current), new, ptrace_event);
}
}
new->status = PS_RUNNING;
chain_thread(new);
if (!(clone_flags & CLONE_VM)) {
@@ -1938,6 +1923,13 @@ unsigned long do_fork(int clone_flags, unsigned long newsp,
chain_process(new->proc);
}
if (cpu_local_var(current)->proc->ptrace) {
ptrace_event = ptrace_check_clone_event(cpu_local_var(current), clone_flags);
if (ptrace_event) {
ptrace_report_clone(cpu_local_var(current), new, ptrace_event);
}
}
dkprintf("clone: kicking scheduler!,cpuid=%d pid=%d tid %d -> tid=%d\n",
cpuid, new->proc->pid,
cpu_local_var(current)->tid,