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

disable switch until to complete thread termination

Browse Source 
refs #888
This commit is contained in:
Tomoki Shirasawa
2017-07-03 14:47:48 +09:00
parent e64bd49d9e
commit 6e23b07b20
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/syscall.c
View File

@@ -793,8 +793,10 @@ terminate(int rc, int sig)
if(proc->status == PS_EXITED){ if(proc->status == PS_EXITED){
mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock); mcs_rwlock_writer_unlock_noirq(&proc->update_lock, &updatelock);
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock); mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
preempt_disable();
mythread->status = PS_EXITED; mythread->status = PS_EXITED;
release_thread(mythread); release_thread(mythread);
preempt_enable();
schedule(); schedule();
// no return // no return
return; return;
@@ -977,9 +979,11 @@ terminate(int rc, int sig)
waitq_wakeup(&proc->parent->waitpid_q); waitq_wakeup(&proc->parent->waitpid_q);
} }
preempt_disable();
mythread->status = PS_EXITED; mythread->status = PS_EXITED;
release_thread(mythread); release_thread(mythread);
release_process_vm(vm); release_process_vm(vm);
preempt_enable();
schedule(); schedule();
kprintf("%s: ERROR: returned from terminate() -> schedule()\n", __FUNCTION__); kprintf("%s: ERROR: returned from terminate() -> schedule()\n", __FUNCTION__);
panic("panic"); panic("panic");
@@ -4935,10 +4939,12 @@ do_exit(int code)
#endif #endif
return; return;
} }
preempt_disable();
thread->status = PS_EXITED; thread->status = PS_EXITED;
sync_child_event(thread->proc->monitoring_event); sync_child_event(thread->proc->monitoring_event);
mcs_rwlock_reader_unlock(&proc->threads_lock, &lock); mcs_rwlock_reader_unlock(&proc->threads_lock, &lock);
release_thread(thread); release_thread(thread);
preempt_enable();
schedule(); schedule();
#ifdef ENABLE_RUSAGE #ifdef ENABLE_RUSAGE