1 files changed, 36 insertions, 16 deletions

diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 242b221..b6cbc4e 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -78,6 +78,30 @@ unload_td(struct proc *td)
     }
 }
 
+void
+proc_reap(struct proc *td)
+{
+    struct pcb *pcbp;
+    uintptr_t stack;
+
+    pcbp = &td->pcb;
+    stack = td->stack_base;
+
+    /*
+     * If this is on the higher half, it is kernel
+     * mapped and we need to convert it to a physical
+     * address.
+     */
+    if (stack >= VM_HIGHER_HALF) {
+        stack -= VM_HIGHER_HALF;
+    }
+
+    unload_td(td);
+    vm_unmap(pcbp->addrsp, td->stack_base, PROC_STACK_SIZE);
+    vm_free_frame(stack, PROC_STACK_PAGES);
+    pmap_destroy_vas(pcbp->addrsp);
+}
+
 /*
  * Kill a thread and deallocate its resources.
  *
@@ -86,20 +110,18 @@ unload_td(struct proc *td)
 int
 exit1(struct proc *td, int flags)
 {
-    struct pcb *pcbp;
     struct proc *curtd, *procp;
+    struct proc *parent;
     struct cpu_info *ci;
-    uintptr_t stack;
     pid_t target_pid, curpid;
 
     ci = this_cpu();
     target_pid = td->pid;
     curtd = this_td();
-    pcbp = &td->pcb;
 
     curpid = curtd->pid;
-    stack = td->stack_base;
     td->flags |= PROC_EXITING;
+    parent = td->parent;
 
     /* If we have any children, kill them too */
     if (td->nleaves > 0) {
@@ -108,20 +130,10 @@ exit1(struct proc *td, int flags)
         }
     }
 
-    /*
-     * If this is on the higher half, it is kernel
-     * mapped and we need to convert it to a physical
-     * address.
-     */
-    if (stack >= VM_HIGHER_HALF) {
-        stack -= VM_HIGHER_HALF;
+    if (target_pid != curpid) {
+        proc_reap(td);
     }
 
-    unload_td(td);
-    vm_unmap(pcbp->addrsp, td->stack_base, PROC_STACK_SIZE);
-    vm_free_frame(stack, PROC_STACK_PAGES);
-    pmap_destroy_vas(pcbp->addrsp);
-
     /*
      * Only free the process structure if we aren't
      * being waited on, otherwise let it be so the
@@ -139,6 +151,13 @@ exit1(struct proc *td, int flags)
      */
     if (target_pid == curpid) {
         ci->curtd = NULL;
+        if (parent->pid == 0)
+            sched_enter();
+        if (td->data == NULL)
+            sched_enter();
+
+        sched_enqueue_td(parent);
+        parent->flags &= ~PROC_SLEEP;
         sched_enter();
     }
 
@@ -153,6 +172,7 @@ sys_exit(struct syscall_args *scargs)
 {
     struct proc *td = this_td();
 
+    td->data = scargs->tf;
     td->exit_status = scargs->arg0;
     exit1(td, 0);
     __builtin_unreachable();