WebSVN – HelenOS – Diff – /branches/tracing/kernel/generic/src/udebug/udebug.c

 #include <errno.h>
 #include <arch.h>
 void udebug_task_init(udebug_task_t *ut)
+{
+    mutex_initialize(&ut->lock);
     ut->dt_state = UDEBUG_TS_INACTIVE;
     ut->begin_call = NULL;
     ut->not_stoppable_count = 0;
     ut->evmask = 0;
+}
     ipl_t ipl;
     ASSERT(THREAD);
     ASSERT(TASK);
-    ipl = interrupts_disable();
-    spinlock_lock(&TASK->lock);
+    mutex_lock(&TASK->udebug.lock);
     nsc = --TASK->udebug.not_stoppable_count;
     if (TASK->udebug.dt_state == UDEBUG_TS_BEGINNING) {
         klog_printf("udebug_stoppable_begin");
          */
         db_call = TASK->udebug.begin_call;
         ASSERT(db_call);
-        /* Lock order OK, THREAD->debug_lock is after TASK->lock */
+        /* Lock order OK, THREAD->debug_lock is after TASK->udebug.lock */
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->debug_lock);
         THREAD->debug_stoppable = true;
         spinlock_unlock(&THREAD->debug_lock);
+        interrupts_restore(ipl);
         TASK->udebug.dt_state = UDEBUG_TS_ACTIVE;
         TASK->udebug.begin_call = NULL;
-        spinlock_unlock(&TASK->lock);
+        mutex_unlock(&TASK->udebug.lock);
-        interrupts_restore(ipl);
         IPC_SET_RETVAL(db_call->data, 0);
         //klog_printf("udebug_stoppable_begin/ipc_answer");
         ipc_answer(&TASK->answerbox, db_call);
     } else if (TASK->udebug.dt_state == UDEBUG_TS_ACTIVE) {
         /*
          * Active debugging session
          */
-        /* Lock order OK, THREAD->debug_lock is after TASK->lock */
+        /* Lock order OK, THREAD->debug_lock is after TASK->udebug.lock */
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->debug_lock);
         THREAD->debug_stoppable = true;
         if (THREAD->debug_active && THREAD->debug_stop) {
             /*
             IPC_SET_RETVAL(go_call->data, 0);
             IPC_SET_ARG1(go_call->data, UDEBUG_EVENT_STOP);
             THREAD->cur_event = UDEBUG_EVENT_STOP;
             spinlock_unlock(&THREAD->debug_lock);
+            interrupts_restore(ipl);
                 ipc_answer(&TASK->answerbox, go_call);
-                spinlock_unlock(&TASK->lock);
+                mutex_unlock(&TASK->udebug.lock);
-            interrupts_restore(ipl);
         } else {
             /*
              * No stop request - nothing happens.
              */
             spinlock_unlock(&THREAD->debug_lock);
-                spinlock_unlock(&TASK->lock);
             interrupts_restore(ipl);
+                mutex_unlock(&TASK->udebug.lock);
+        }
     } else {
         /*
          * All other cases - nothing special happens.
          */
-        /* Lock order OK, THREAD->debug_lock is after TASK->lock */
+        /* Lock order OK, THREAD->debug_lock is after TASK->udebug.lock */
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->debug_lock);
         THREAD->debug_stoppable = true;
         spinlock_unlock(&THREAD->debug_lock);
-            spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
+            mutex_unlock(&TASK->udebug.lock);
+    }
+}
 void udebug_stoppable_end(void)
+{
     ipl_t ipl;
 restart:
-    ipl = interrupts_disable();
-    spinlock_lock(&TASK->lock);
+    mutex_lock(&TASK->udebug.lock);
-    /* Lock order OK, THREAD->debug_lock is after TASK->lock */
+    /* Lock order OK, THREAD->debug_lock is after TASK->udebug.lock */
+    ipl = interrupts_disable();
     spinlock_lock(&THREAD->debug_lock);
     if (TASK->udebug.dt_state == UDEBUG_TS_ACTIVE) {
         //klog_printf("udebug_stoppable_end");
         //klog_printf("debug_stop=%d", THREAD->debug_stop);
     if (THREAD->debug_active &&
         THREAD->debug_stop == true) {
         TASK->udebug.begin_call = NULL;
         spinlock_unlock(&THREAD->debug_lock);
-        spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
+        mutex_unlock(&TASK->udebug.lock);
         udebug_wait_for_go(&THREAD->go_wq);
         goto restart;
         /* must try again - have to lose stoppability atomically */
     } else {
         ++TASK->udebug.not_stoppable_count;
         THREAD->debug_stoppable = false;
         spinlock_unlock(&THREAD->debug_lock);
-        spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
+        mutex_unlock(&TASK->udebug.lock);
+    }
+}
 /** Upon being scheduled to run, check if the current thread should stop.
+ *
         return;
     THREAD->debug_in_before_thread_runs = true;
     ipl = interrupts_enable();
-    /* Now we're free to do whatever we need (lock mutexes, etc.) */
+    /* Now we're free to do whatever we need (lock mutexes, sleep, etc.) */
     /* Check if we're supposed to stop */
     udebug_stoppable_begin();
     udebug_stoppable_end();
     ipl_t ipl;
     udebug_event_t etype;
     etype = end_variant ? UDEBUG_EVENT_SYSCALL_E : UDEBUG_EVENT_SYSCALL_B;
+    mutex_lock(&TASK->udebug.lock);
     ipl = interrupts_disable();
     spinlock_lock(&THREAD->debug_lock);
     /* Must only generate events when in debugging session and have go */
     if (THREAD->debug_active != true ||
         THREAD->debug_stop == true ||
         (TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) {
         spinlock_unlock(&THREAD->debug_lock);
         interrupts_restore(ipl);
+        mutex_unlock(&TASK->udebug.lock);
         return;
+    }
     //klog_printf("udebug_syscall_event");
     call = THREAD->debug_go_call;
+    THREAD->debug_go_call = NULL;
     IPC_SET_RETVAL(call->data, 0);
     IPC_SET_ARG1(call->data, etype);
     IPC_SET_ARG2(call->data, id);
     IPC_SET_ARG3(call->data, rc);
     //klog_printf("udebug_syscall_event/ipc_answer");
      */
     THREAD->debug_stop = true;
     THREAD->cur_event = etype;
     spinlock_unlock(&THREAD->debug_lock);
-    spinlock_lock(&TASK->lock);
-    ipc_answer(&TASK->answerbox, THREAD->debug_go_call);
-    spinlock_unlock(&TASK->lock);
     interrupts_restore(ipl);
+    ipc_answer(&TASK->answerbox, call);
+    mutex_unlock(&TASK->udebug.lock);
     udebug_wait_for_go(&THREAD->go_wq);
+}
 void udebug_thread_b_event(struct thread *t)
+{
     call_t *call;
     ipl_t ipl;
+    mutex_lock(&TASK->udebug.lock);
     ipl = interrupts_disable();
     spinlock_lock(&THREAD->debug_lock);
     klog_printf("udebug_thread_b_event");
     klog_printf("- check state");
         klog_printf("- debug_active: %s, debug_stop: %s",
             THREAD->debug_active ? "yes(+)" : "no(-)",
             THREAD->debug_stop ? "yes(-)" : "no(+)");
         spinlock_unlock(&THREAD->debug_lock);
         interrupts_restore(ipl);
+        mutex_unlock(&TASK->udebug.lock);
         return;
+    }
     klog_printf("- trigger event");
     call = THREAD->debug_go_call;
+    THREAD->debug_go_call = NULL;
     IPC_SET_RETVAL(call->data, 0);
     IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_B);
     IPC_SET_ARG2(call->data, (unative_t)t);
     /*
      */
     THREAD->debug_stop = true;
     THREAD->cur_event = UDEBUG_EVENT_THREAD_B;
     spinlock_unlock(&THREAD->debug_lock);
+    interrupts_restore(ipl);
-    spinlock_lock(&TASK->lock);
-    ipc_answer(&TASK->answerbox, THREAD->debug_go_call);
+    ipc_answer(&TASK->answerbox, call);
-    spinlock_unlock(&TASK->lock);
+    mutex_unlock(&TASK->udebug.lock);
-    interrupts_restore(ipl);
     klog_printf("- sleep");
     udebug_wait_for_go(&THREAD->go_wq);
+}
 void udebug_thread_e_event(void)
+{
     call_t *call;
     ipl_t ipl;
+    mutex_lock(&TASK->udebug.lock);
     ipl = interrupts_disable();
     spinlock_lock(&THREAD->debug_lock);
     klog_printf("udebug_thread_e_event");
     klog_printf("- check state");
         klog_printf("- debug_active: %s, debug_stop: %s",
             THREAD->debug_active ? "yes(+)" : "no(-)",
             THREAD->debug_stop ? "yes(-)" : "no(+)");
         spinlock_unlock(&THREAD->debug_lock);
         interrupts_restore(ipl);
+        mutex_unlock(&TASK->udebug.lock);
         return;
+    }
     klog_printf("- trigger event");
     call = THREAD->debug_go_call;
+    THREAD->debug_go_call = NULL;
     IPC_SET_RETVAL(call->data, 0);
     IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_E);
     /* Prevent any further debug activity in thread */
     THREAD->debug_active = false;
     THREAD->cur_event = 0;      /* none */
     THREAD->debug_stop = true;  /* set to initial value */
     spinlock_unlock(&THREAD->debug_lock);
+    interrupts_restore(ipl);
-    spinlock_lock(&TASK->lock);
-    ipc_answer(&TASK->answerbox, THREAD->debug_go_call);
+    ipc_answer(&TASK->answerbox, call);
-    spinlock_unlock(&TASK->lock);
-    interrupts_restore(ipl);
+    mutex_unlock(&TASK->udebug.lock);
     /* This event does not sleep - debugging has finished in this thread */
+}
 static void breakpoint_trap_event(uintptr_t addr, udebug_event_t etype)
+{
     call_t *call;
     ipl_t ipl;
+    mutex_lock(&TASK->udebug.lock);
     ipl = interrupts_disable();
     spinlock_lock(&THREAD->debug_lock);
     /* Must only generate events when in debugging session and have go */
     if (THREAD->debug_active != true ||
         THREAD->debug_stop == true ||
         (TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) {
         spinlock_unlock(&THREAD->debug_lock);
         interrupts_restore(ipl);
+        mutex_unlock(&TASK->udebug.lock);
         return;
+    }
     klog_printf("udebug_breakpoint/trap_event");
     call = THREAD->debug_go_call;
+    THREAD->debug_go_call = NULL;
     IPC_SET_RETVAL(call->data, 0);
     IPC_SET_ARG1(call->data, etype);
     IPC_SET_ARG2(call->data, addr);
     /*
      */
     THREAD->debug_stop = true;
     THREAD->cur_event = etype;
     spinlock_unlock(&THREAD->debug_lock);
+    interrupts_restore(ipl);
     klog_printf("- send answer");
-    spinlock_lock(&TASK->lock);
-    ipc_answer(&TASK->answerbox, THREAD->debug_go_call);
+    ipc_answer(&TASK->answerbox, call);
-    spinlock_unlock(&TASK->lock);
+    mutex_unlock(&TASK->udebug.lock);
-    interrupts_restore(ipl);
     udebug_wait_for_go(&THREAD->go_wq);
+}
 void udebug_breakpoint_event(uintptr_t addr)
+}
 /**
  * Terminate task debugging session.
+ *
- * \param ta Must be already locked and interrupts must be disabled.
+ * \param ta->udebug.lock must be already locked.
  * \return Zero on success or negative error code.
  */
 int udebug_task_cleanup(struct task *ta)
+{
     thread_t *t;
     link_t *cur;
     int flags;
+    ipl_t ipl;
     klog_printf("udebug_task_cleanup()");
     klog_printf("task %llu", ta->taskid);
     if (ta->udebug.dt_state == UDEBUG_TS_BEGINNING &&
     /* Finish debugging of all userspace threads */
     for (cur = ta->th_head.next; cur != &ta->th_head; cur = cur->next) {
         t = list_get_instance(cur, thread_t, th_link);
+        ipl = interrupts_disable();
         spinlock_lock(&t->debug_lock);
         spinlock_lock(&t->lock);
         flags = t->flags;
                 /* Answer GO call */
                 klog_printf("answer GO call with EVENT_FINISHED");
                 IPC_SET_RETVAL(t->debug_go_call->data, 0);
                 IPC_SET_ARG1(t->debug_go_call->data, UDEBUG_EVENT_FINISHED);
+                /* FIXME: must not call with interrupts disabled!!*/
                 ipc_answer(&ta->answerbox, t->debug_go_call);
+                t->debug_go_call = NULL;
             } else {
                 /*
                  * Debug_stop is already at initial value.
                  * Yet this means the thread needs waking up.
                  */
                  */
                 waitq_wakeup(&t->go_wq, WAKEUP_FIRST);
+            }
+        }
         spinlock_unlock(&t->debug_lock);
+        interrupts_restore(ipl);
+    }
     ta->udebug.dt_state = UDEBUG_TS_INACTIVE;
     ta->udebug.debugger = NULL;

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/generic/src/udebug/udebug.c – Rev 3015 → 3016