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

  * @{
  */
 /**
  * @file
- * @brief   Udebug.
+ * @brief   Udebug hooks and data structure management.
+ *
+ * Udebug is an interface that makes userspace debuggers possible.
+ *
  * Functions in this file are executed directly in each thread, which
  * may or may not be the subject of debugging. The udebug_stoppable_begin/end()
  * functions are also executed in the clock interrupt handler. To avoid
  * deadlock, functions in this file are protected from the interrupt
  * so they needn't be protected from the (preemptible) interrupt-initiated
  * code.
  */
 #include <synch/waitq.h>
-#include <print.h>
+#include <debug.h>
 #include <udebug/udebug.h>
 #include <errno.h>
 #include <arch.h>
 static inline void udebug_int_lock(void)
 static inline void udebug_int_unlock(void)
+{
     atomic_dec(&THREAD->udebug.int_lock);
+}
+/** Initialize udebug part of task structure.
+ *
+ * Called as part of task structure initialization.
+ * @param ut    Pointer to the structure to initialize.
+ */
 void udebug_task_init(udebug_task_t *ut)
+{
     mutex_initialize(&ut->lock, MUTEX_PASSIVE);
     ut->dt_state = UDEBUG_TS_INACTIVE;
     ut->begin_call = NULL;
     ut->not_stoppable_count = 0;
     ut->evmask = 0;
+}
+/** Initialize udebug part of thread structure.
+ *
+ * Called as part of thread structure initialization.
+ * @param ut    Pointer to the structure to initialize.
+ */
 void udebug_thread_initialize(udebug_thread_t *ut)
+{
     mutex_initialize(&ut->lock, MUTEX_PASSIVE);
     waitq_initialize(&ut->go_wq);
     ut->stoppable = true;
     ut->debug_active = false;
     ut->cur_event = 0; /* none */
+}
+/** Wait for a GO message.
+ *
+ * When a debugging event occurs in a thread or the thread is stopped,
+ * this function is called to block the thread until a GO message
+ * is received.
+ *
+ * @param wq    The wait queue used by the thread to wait for GO messages.
+ */
 static void udebug_wait_for_go(waitq_t *wq)
+{
     int rc;
     ipl_t ipl;
     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
+ * This only requires the THREAD->udebug.lock mutex (and not TASK->udebug.lock
- * TASK->udebug.lock mutex). For an undebugged task, this will
+ * mutex). For an undebugged task, this will never block (while there could be
- * never block (while there could be collisions by different threads
+ * collisions by different threads on the TASK mutex), thus improving SMP
- * on the TASK mutex), thus improving SMP perormance for undebugged tasks.
+ * 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_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.
+ *
+ * Having stoppable sections is better than having stopping points, since
+ * a thread can be stopped even when it is blocked indefinitely in a system
+ * call (whereas it would not reach any stopping point).
+ */
 void udebug_stoppable_begin(void)
+{
     int nsc;
     call_t *db_call, *go_call;
     mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
+}
+/** End of a stoppable section.
+ *
+ * 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()) {
         udebug_int_unlock();
     interrupts_restore(ipl);
     udebug_int_unlock();
+}
+/** Syscall event hook.
+ *
+ * Must be called before and after servicing a system call. This generates
+ * a SYSCALL_B or SYSCALL_E event, depending on the value of @a end_variant.
+ */
 void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
     unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
     bool end_variant)
+{
     call_t *call;
     udebug_wait_for_go(&THREAD->udebug.go_wq);
     udebug_int_unlock();
+}
+/** Thread-creation event hook.
+ *
+ * Must be called when a new userspace thread is created in the debugged
+ * task. Generates a THREAD_B event.
+ *
+ * @param t Structure of the thread being created. Not locked, as the
+ *      thread is not executing yet.
+ */
 void udebug_thread_b_event(struct thread *t)
+{
     call_t *call;
     udebug_int_lock();
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
-    printf("udebug_thread_b_event\n");
+    LOG("udebug_thread_b_event\n");
-    printf("- check state\n");
+    LOG("- check state\n");
     /* Must only generate events when in debugging session */
     if (THREAD->udebug.debug_active != true) {
-        printf("- debug_active: %s, udebug.stop: %s\n",
+        LOG("- debug_active: %s, udebug.stop: %s\n",
             THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
             THREAD->udebug.stop ? "yes(-)" : "no(+)");
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
         return;
+    }
-    printf("- trigger event\n");
+    LOG("- trigger event\n");
     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_answer(&TASK->answerbox, call);
     mutex_unlock(&THREAD->udebug.lock);
     mutex_unlock(&TASK->udebug.lock);
-    printf("- sleep\n");
+    LOG("- sleep\n");
     udebug_wait_for_go(&THREAD->udebug.go_wq);
     udebug_int_unlock();
+}
+/** Thread-termination event hook.
+ *
+ * Must be called when the current thread is terminating.
+ * Generates a THREAD_E event.
+ */
 void udebug_thread_e_event(void)
+{
     call_t *call;
     udebug_int_lock();
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
-//  printf("udebug_thread_e_event\n");
+    LOG("udebug_thread_e_event\n");
-//  printf("- check state\n");
+    LOG("- check state\n");
     /* Must only generate events when in debugging session */
     if (THREAD->udebug.debug_active != true) {
 /*      printf("- debug_active: %s, udebug.stop: %s\n",
             THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
         return;
+    }
-//  printf("- trigger event\n");
+    LOG("- trigger event\n");
     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);
+}
 /**
  * Terminate task debugging session.
+ *
+ * Gracefully terminates the debugging session for a task. If the debugger
+ * is still waiting for events on some threads, it will receive a
+ * FINISHED event for each of them.
+ *
- * \param ta->udebug.lock must be already locked.
+ * @param ta    Task structure. ta->udebug.lock must be already locked.
- * \return Zero on success or negative error code.
+ * @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;
-    printf("udebug_task_cleanup()\n");
+    LOG("udebug_task_cleanup()\n");
-    printf("task %llu\n", ta->taskid);
+    LOG("task %" PRIu64 "\n", ta->taskid);
     udebug_int_lock();
     if (ta->udebug.dt_state != UDEBUG_TS_BEGINNING &&
         ta->udebug.dt_state != UDEBUG_TS_ACTIVE) {
-        printf("udebug_task_cleanup(): task not being debugged\n");
+        LOG("udebug_task_cleanup(): task not being debugged\n");
         return EINVAL;
+    }
     /* Finish debugging of all userspace threads */
     for (cur = ta->th_head.next; cur != &ta->th_head; cur = cur->next) {
                  * this doesn't affect anything.
                  */
                 t->udebug.stop = true;
                 /* Answer GO call */
-                printf("answer GO call with EVENT_FINISHED\n");
+                LOG("answer GO call with EVENT_FINISHED\n");
                 IPC_SET_RETVAL(t->udebug.go_call->data, 0);
-                IPC_SET_ARG1(t->udebug.go_call->data, UDEBUG_EVENT_FINISHED);
+                IPC_SET_ARG1(t->udebug.go_call->data,
+                    UDEBUG_EVENT_FINISHED);
                 ipc_answer(&ta->answerbox, t->udebug.go_call);
                 t->udebug.go_call = NULL;
             } else {
                 /*

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/generic/src/udebug/udebug.c – Rev 3428 → 3471