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

     rc = waitq_sleep_timeout_unsafe(wq, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
     waitq_sleep_finish(wq, rc, ipl);
+}
-/** Do a preliminary check that a debugging session is in progress.
- *
- * This only requires the THREAD->udebug.lock mutex (and not TASK->udebug.lock
- * mutex). For an undebugged task, this will never block (while there could be
- * collisions by different threads on the TASK mutex), thus improving SMP
- * perormance for undebugged tasks.
- *
- * @return  True if the thread was in a debugging session when the function
- *      checked, false otherwise.
- */
-static bool udebug_thread_precheck(void)
-{
-    bool res;
-    mutex_lock(&THREAD->udebug.lock);
-    res = THREAD->udebug.active;
-    mutex_unlock(&THREAD->udebug.lock);
-    return res;
-}
 /** Start of stoppable section.
+ *
  * A stoppable section is a section of code where if the thread can be stoped. In other words,
  * if a STOP operation is issued, the thread is guaranteed not to execute
  * any userspace instructions until the thread is resumed.
     call_t *db_call, *go_call;
     ASSERT(THREAD);
     ASSERT(TASK);
-    /* Early check for undebugged tasks */
-    if (!udebug_thread_precheck()) {
-        return;
-    }
     mutex_lock(&TASK->udebug.lock);
     nsc = --TASK->udebug.not_stoppable_count;
     /* Lock order OK, THREAD->udebug.lock is after TASK->udebug.lock */
  * This is the point where the thread will block if it is stopped.
  * (As, by definition, a stopped thread must not leave its stoppable section).
  */
 void udebug_stoppable_end(void)
+{
-    /* Early check for undebugged tasks */
-    if (!udebug_thread_precheck()) {
-        return;
-    }
 restart:
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
     if (THREAD->udebug.active && THREAD->udebug.go == false) {
     call_t *call;
     udebug_event_t etype;
     etype = end_variant ? UDEBUG_EVENT_SYSCALL_E : UDEBUG_EVENT_SYSCALL_B;
-    /* Early check for undebugged tasks */
-    if (!udebug_thread_precheck()) {
-        return;
-    }
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
     /* Must only generate events when in debugging session and is go. */
     if (THREAD->udebug.active != true || THREAD->udebug.go == false ||
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
         return;
+    }
-    //printf("udebug_syscall_event\n");
+    /* Fill in the GO response. */
     call = THREAD->udebug.go_call;
     THREAD->udebug.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);
-    //printf("udebug_syscall_event/ipc_answer\n");
     THREAD->udebug.syscall_args[0] = a1;
     THREAD->udebug.syscall_args[1] = a2;
     THREAD->udebug.syscall_args[2] = a3;
     THREAD->udebug.syscall_args[3] = a4;
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
     thread_attach(t, ta);
-    LOG("udebug_thread_b_event\n");
-    LOG("- check state\n");
+    LOG("Check state");
     /* Must only generate events when in debugging session */
     if (THREAD->udebug.active != true) {
-        LOG("- udebug.active: %s, udebug.go: %s\n",
+        LOG("udebug.active: %s, udebug.go: %s",
-            THREAD->udebug.active ? "yes(+)" : "no(-)",
+            THREAD->udebug.active ? "Yes(+)" : "No",
-            THREAD->udebug.go ? "yes(-)" : "no(+)");
+            THREAD->udebug.go ? "Yes(-)" : "No");
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
         return;
+    }
-    LOG("- trigger event\n");
+    LOG("Trigger event");
     call = THREAD->udebug.go_call;
     THREAD->udebug.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);
     ipc_answer(&TASK->answerbox, call);
     mutex_unlock(&THREAD->udebug.lock);
     mutex_unlock(&TASK->udebug.lock);
-    LOG("- sleep\n");
+    LOG("Wait for Go");
     udebug_wait_for_go(&THREAD->udebug.go_wq);
+}
 /** Thread-termination event hook.
+ *
     call_t *call;
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
-    LOG("udebug_thread_e_event\n");
-    LOG("- check state\n");
+    LOG("Check state");
     /* Must only generate events when in debugging session. */
     if (THREAD->udebug.active != true) {
-/*      printf("- udebug.active: %s, udebug.go: %s\n",
+        LOG("udebug.active: %s, udebug.go: %s",
-            THREAD->udebug.active ? "yes(+)" : "no(-)",
+            THREAD->udebug.active ? "Yes" : "No",
-            THREAD->udebug.go ? "yes(-)" : "no(+)");*/
+            THREAD->udebug.go ? "Yes" : "No");
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
         return;
+    }
-    LOG("- trigger event\n");
+    LOG("Trigger event");
     call = THREAD->udebug.go_call;
     THREAD->udebug.go_call = NULL;
     IPC_SET_RETVAL(call->data, 0);
     IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_E);
     thread_t *t;
     link_t *cur;
     int flags;
     ipl_t ipl;
-    LOG("udebug_task_cleanup()\n");
-    LOG("task %" PRIu64 "\n", ta->taskid);
     if (ta->udebug.dt_state != UDEBUG_TS_BEGINNING &&
         ta->udebug.dt_state != UDEBUG_TS_ACTIVE) {
-        LOG("udebug_task_cleanup(): task not being debugged\n");
         return EINVAL;
+    }
+    LOG("Task %" PRIu64, ta->taskid);
     /* 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);
         mutex_lock(&t->udebug.lock);
                  * this doesn't affect anything.
                  */
                 t->udebug.go = false;
                 /* Answer GO call */
-                LOG("answer GO call with EVENT_FINISHED\n");
+                LOG("Answer GO call with EVENT_FINISHED.");
                 IPC_SET_RETVAL(t->udebug.go_call->data, 0);
                 IPC_SET_ARG1(t->udebug.go_call->data,
                     UDEBUG_EVENT_FINISHED);
                 ipc_answer(&ta->answerbox, t->udebug.go_call);

Subversion Repositories HelenOS

(root)//branches/dd/kernel/generic/src/udebug/udebug.c – Rev 4055 → 4420