35,18 → 35,6 |
* @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 |
* by locking the recursive lock THREAD->udebug.int_lock (just an atomic |
* variable). This prevents udebug_stoppable_begin/end() from being |
* executed in the interrupt handler (they are skipped). |
* |
* Functions in udebug_ops.c and udebug_ipc.c execute in different threads, |
* so they needn't be protected from the (preemptible) interrupt-initiated |
* code. |
*/ |
|
#include <synch/waitq.h> |
55,16 → 43,7 |
#include <errno.h> |
#include <arch.h> |
|
static inline void udebug_int_lock(void) |
{ |
atomic_inc(&THREAD->udebug.int_lock); |
} |
|
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. |
89,14 → 68,9 |
mutex_initialize(&ut->lock, MUTEX_PASSIVE); |
waitq_initialize(&ut->go_wq); |
|
/* |
* At the beginning the thread is stoppable, so int_lock be set, too. |
*/ |
atomic_set(&ut->int_lock, 1); |
|
ut->go_call = NULL; |
ut->uspace_state = NULL; |
ut->stop = true; |
ut->go = false; |
ut->stoppable = true; |
ut->debug_active = false; |
ut->cur_event = 0; /* none */ |
162,11 → 136,8 |
ASSERT(THREAD); |
ASSERT(TASK); |
|
udebug_int_lock(); |
|
/* Early check for undebugged tasks */ |
if (!udebug_thread_precheck()) { |
udebug_int_unlock(); |
return; |
} |
|
199,7 → 170,8 |
* Active debugging session |
*/ |
|
if (THREAD->udebug.debug_active && THREAD->udebug.stop) { |
if (THREAD->udebug.debug_active == true && |
THREAD->udebug.go == false) { |
/* |
* Thread was requested to stop - answer go call |
*/ |
231,7 → 203,6 |
{ |
/* Early check for undebugged tasks */ |
if (!udebug_thread_precheck()) { |
udebug_int_unlock(); |
return; |
} |
|
240,7 → 211,7 |
mutex_lock(&THREAD->udebug.lock); |
|
if (THREAD->udebug.debug_active && |
THREAD->udebug.stop == true) { |
THREAD->udebug.go == false) { |
TASK->udebug.begin_call = NULL; |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
248,7 → 219,7 |
udebug_wait_for_go(&THREAD->udebug.go_wq); |
|
goto restart; |
/* must try again - have to lose stoppability atomically */ |
/* Must try again - have to lose stoppability atomically. */ |
} else { |
++TASK->udebug.not_stoppable_count; |
ASSERT(THREAD->udebug.stoppable == true); |
257,8 → 228,6 |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
} |
|
udebug_int_unlock(); |
} |
|
/** Upon being scheduled to run, check if the current thread should stop. |
273,17 → 242,7 |
ipl_t ipl; |
|
return; |
ASSERT(!PREEMPTION_DISABLED); |
|
/* |
* Prevent agains re-entering, such as when preempted inside this |
* function. |
*/ |
if (atomic_get(&THREAD->udebug.int_lock) != 0) |
return; |
|
udebug_int_lock(); |
|
ipl = interrupts_enable(); |
|
/* Now we're free to do whatever we need (lock mutexes, sleep, etc.) */ |
293,8 → 252,6 |
udebug_stoppable_end(); |
|
interrupts_restore(ipl); |
|
udebug_int_unlock(); |
} |
|
/** Syscall event hook. |
311,11 → 268,8 |
|
etype = end_variant ? UDEBUG_EVENT_SYSCALL_E : UDEBUG_EVENT_SYSCALL_B; |
|
udebug_int_lock(); |
|
/* Early check for undebugged tasks */ |
if (!udebug_thread_precheck()) { |
udebug_int_unlock(); |
return; |
} |
|
322,9 → 276,9 |
mutex_lock(&TASK->udebug.lock); |
mutex_lock(&THREAD->udebug.lock); |
|
/* Must only generate events when in debugging session and have go */ |
/* Must only generate events when in debugging session and is go. */ |
if (THREAD->udebug.debug_active != true || |
THREAD->udebug.stop == true || |
THREAD->udebug.go == false || |
(TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) { |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
349,11 → 303,11 |
THREAD->udebug.syscall_args[5] = a6; |
|
/* |
* Make sure udebug.stop is true when going to sleep |
* Make sure udebug.go is false when going to sleep |
* in case we get woken up by DEBUG_END. (At which |
* point it must be back to the initial true value). |
*/ |
THREAD->udebug.stop = true; |
THREAD->udebug.go = false; |
THREAD->udebug.cur_event = etype; |
|
ipc_answer(&TASK->answerbox, call); |
362,8 → 316,6 |
mutex_unlock(&TASK->udebug.lock); |
|
udebug_wait_for_go(&THREAD->udebug.go_wq); |
|
udebug_int_unlock(); |
} |
|
/** Thread-creation event hook. |
378,8 → 330,6 |
{ |
call_t *call; |
|
udebug_int_lock(); |
|
mutex_lock(&TASK->udebug.lock); |
mutex_lock(&THREAD->udebug.lock); |
|
388,9 → 338,9 |
|
/* Must only generate events when in debugging session */ |
if (THREAD->udebug.debug_active != true) { |
LOG("- debug_active: %s, udebug.stop: %s\n", |
LOG("- debug_active: %s, udebug.go: %s\n", |
THREAD->udebug.debug_active ? "yes(+)" : "no(-)", |
THREAD->udebug.stop ? "yes(-)" : "no(+)"); |
THREAD->udebug.go ? "yes(-)" : "no(+)"); |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
return; |
405,11 → 355,11 |
IPC_SET_ARG2(call->data, (unative_t)t); |
|
/* |
* Make sure udebug.stop is true when going to sleep |
* Make sure udebug.go is false when going to sleep |
* in case we get woken up by DEBUG_END. (At which |
* point it must be back to the initial true value). |
*/ |
THREAD->udebug.stop = true; |
THREAD->udebug.go = false; |
THREAD->udebug.cur_event = UDEBUG_EVENT_THREAD_B; |
|
ipc_answer(&TASK->answerbox, call); |
419,8 → 369,6 |
|
LOG("- sleep\n"); |
udebug_wait_for_go(&THREAD->udebug.go_wq); |
|
udebug_int_unlock(); |
} |
|
/** Thread-termination event hook. |
432,8 → 380,6 |
{ |
call_t *call; |
|
udebug_int_lock(); |
|
mutex_lock(&TASK->udebug.lock); |
mutex_lock(&THREAD->udebug.lock); |
|
440,11 → 386,11 |
LOG("udebug_thread_e_event\n"); |
LOG("- check state\n"); |
|
/* Must only generate events when in debugging session */ |
/* Must only generate events when in debugging session. */ |
if (THREAD->udebug.debug_active != true) { |
/* printf("- debug_active: %s, udebug.stop: %s\n", |
/* printf("- debug_active: %s, udebug.go: %s\n", |
THREAD->udebug.debug_active ? "yes(+)" : "no(-)", |
THREAD->udebug.stop ? "yes(-)" : "no(+)");*/ |
THREAD->udebug.go ? "yes(-)" : "no(+)");*/ |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
return; |
457,10 → 403,10 |
IPC_SET_RETVAL(call->data, 0); |
IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_E); |
|
/* Prevent any further debug activity in thread */ |
/* Prevent any further debug activity in thread. */ |
THREAD->udebug.debug_active = false; |
THREAD->udebug.cur_event = 0; /* none */ |
THREAD->udebug.stop = true; /* set to initial value */ |
THREAD->udebug.go = false; /* set to initial value */ |
|
ipc_answer(&TASK->answerbox, call); |
|
467,8 → 413,10 |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
|
/* Leave int_lock enabled */ |
/* This event does not sleep - debugging has finished in this thread */ |
/* |
* This event does not sleep - debugging has finished |
* in this thread. |
*/ |
} |
|
static void breakpoint_trap_event(uintptr_t addr, udebug_event_t etype) |
475,17 → 423,14 |
{ |
call_t *call; |
|
udebug_int_lock(); |
|
mutex_lock(&TASK->udebug.lock); |
mutex_lock(&THREAD->udebug.lock); |
|
/* Must only generate events when in debugging session and have go */ |
/* Must only generate events when in debugging session and have go. */ |
if (THREAD->udebug.debug_active != true || |
THREAD->udebug.stop == true) { |
THREAD->udebug.go == false) { |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
udebug_int_unlock(); |
return; |
} |
|
493,7 → 438,6 |
if ((TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) { |
mutex_unlock(&THREAD->udebug.lock); |
mutex_unlock(&TASK->udebug.lock); |
udebug_int_unlock(); |
return; |
} |
|
506,11 → 450,11 |
IPC_SET_ARG2(call->data, addr); |
|
/* |
* Make sure udebug.stop is true when going to sleep |
* Make sure udebug.go is false when going to sleep |
* in case we get woken up by DEBUG_END. (At which |
* point it must be back to the initial true value). |
*/ |
THREAD->udebug.stop = true; |
THREAD->udebug.go = false; |
THREAD->udebug.cur_event = etype; |
|
printf("- send answer\n"); |
520,8 → 464,6 |
mutex_unlock(&TASK->udebug.lock); |
|
udebug_wait_for_go(&THREAD->udebug.go_wq); |
|
udebug_int_unlock(); |
} |
|
void udebug_breakpoint_event(uintptr_t addr) |
554,8 → 496,6 |
LOG("udebug_task_cleanup()\n"); |
LOG("task %" PRIu64 "\n", ta->taskid); |
|
udebug_int_lock(); |
|
if (ta->udebug.dt_state != UDEBUG_TS_BEGINNING && |
ta->udebug.dt_state != UDEBUG_TS_ACTIVE) { |
LOG("udebug_task_cleanup(): task not being debugged\n"); |
576,19 → 516,19 |
spinlock_unlock(&t->lock); |
interrupts_restore(ipl); |
|
/* Only process userspace threads */ |
/* Only process userspace threads. */ |
if ((flags & THREAD_FLAG_USPACE) != 0) { |
/* Prevent any further debug activity in thread */ |
/* Prevent any further debug activity in thread. */ |
t->udebug.debug_active = false; |
t->udebug.cur_event = 0; /* none */ |
|
/* Still has go? */ |
if (t->udebug.stop == false) { |
/* Is the thread still go? */ |
if (t->udebug.go == true) { |
/* |
* Yes, so clear go. As debug_active == false, |
* this doesn't affect anything. |
*/ |
t->udebug.stop = true; |
t->udebug.go = false; |
|
/* Answer GO call */ |
LOG("answer GO call with EVENT_FINISHED\n"); |
617,8 → 557,6 |
ta->udebug.dt_state = UDEBUG_TS_INACTIVE; |
ta->udebug.debugger = NULL; |
|
udebug_int_unlock(); |
|
return 0; |
} |
|