add cancellation test, will ask about bug at meeting

1 files changed, 7 insertions, 2 deletions

diff --git a/kernel/proc/proc.c b/kernel/proc/proc.c
index d0566ec..7350acb 100644
--- a/kernel/proc/proc.c
+++ b/kernel/proc/proc.c
@@ -242,6 +242,8 @@ proc_t *proc_create(const char *name)
 void proc_cleanup(long status)
 {
     // NOT_YET_IMPLEMENTED("PROCS: proc_cleanup");
+    dbg(DBG_PROC, "proc_cleanup called on proc with pid=%d with exit status=%d\n", curproc->p_pid, status);
+
 
     if (curproc->p_pid == PID_INIT)
     {
@@ -258,7 +260,7 @@ void proc_cleanup(long status)
     list_link_t *link;
     list_iterate(&curproc->p_children, child, proc_t, p_child_link)
     {
-        // remove insert to init process
+        // remove & insert to init process
         list_insert_tail(&curproc->p_pproc->p_children, &child->p_child_link);
         list_remove(&child->p_child_link);
         child->p_pproc = proc_initproc;
@@ -303,12 +305,14 @@ void proc_thread_exiting(void *retval)
 void proc_kill(proc_t *proc, long status)
 {
     // NOT_YET_IMPLEMENTED("PROCS: proc_kill");
+    dbg(DBG_PROC, "proc_kill called on proc with pid=%d\n", proc->p_pid);
 
     KASSERT(proc != curproc && "proc_kill called on curproc");
 
     list_iterate(&proc->p_threads, thr, kthread_t, kt_plink)
     {
-        kthread_cancel(thr, (void *) status);
+        dbg(DBG_PROC, "cancelling thread on proc with pid=%d with status=%ld\n", proc->p_pid, status);
+        kthread_cancel(thr, (void *)status);
     }
 }
 
@@ -429,6 +433,7 @@ pid_t do_waitpid(pid_t pid, int *status, int options)
         // sleep until this specific child process exits
         while (child->p_state != PROC_DEAD)
         {
+            dbg(DBG_PROC, "waiting for specific child, calling sched_sleep_on\n");
             sched_sleep_on(&curproc->p_wait);
         }