Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4659 → Rev 4658

/trunk/uspace/app/trace/trace.c
43,7 → 43,6
#include <task.h>
#include <mem.h>
#include <string.h>
#include <bool.h>
#include <loader/loader.h>
#include <io/console.h>
#include <io/keycode.h>
69,15 → 68,15
int next_thread_id;
 
int phoneid;
bool abort_trace;
int abort_trace;
 
uintptr_t thash;
static bool paused;
static fibril_condvar_t state_cv;
static fibril_mutex_t state_lock;
volatile int paused;
fibril_condvar_t state_cv;
fibril_mutex_t state_lock;
 
static bool cev_valid;
static console_event_t cev;
int cev_valid;
console_event_t cev;
 
void thread_trace_start(uintptr_t thread_hash);
 
84,7 → 83,7
static proto_t *proto_console;
static task_id_t task_id;
static loader_t *task_ldr;
static bool task_wait_for;
static int task_wait_for;
 
/** Combination of events/data to print. */
display_mask_t display_mask;
508,7 → 507,7
case UDEBUG_EVENT_STOP:
printf("Stop event\n");
fibril_mutex_lock(&state_lock);
paused = true;
paused = 1;
fibril_mutex_unlock(&state_lock);
break;
case UDEBUG_EVENT_THREAD_B:
517,7 → 516,7
case UDEBUG_EVENT_THREAD_E:
printf("Thread 0x%lx exited.\n", val0);
fibril_mutex_lock(&state_lock);
abort_trace = true;
abort_trace = 1;
fibril_condvar_broadcast(&state_cv);
fibril_mutex_unlock(&state_lock);
break;
628,7 → 627,7
return -1;
 
fibril_mutex_lock(&state_lock);
cev_valid = true;
cev_valid = 1;
fibril_condvar_broadcast(&state_cv);
fibril_mutex_unlock(&state_lock);
}
655,7 → 654,7
return;
}
 
abort_trace = false;
abort_trace = 0;
 
for (i = 0; i < n_threads; i++) {
thread_trace_start(thread_hash_buf[i]);
694,7 → 693,7
break;
case KC_R:
fibril_mutex_lock(&state_lock);
paused = false;
paused = 0;
fibril_condvar_broadcast(&state_cv);
fibril_mutex_unlock(&state_lock);
printf("Resume...\n");
703,7 → 702,7
}
 
printf("\nTerminate debugging session...\n");
abort_trace = true;
abort_trace = 1;
udebug_end(phoneid);
ipc_hangup(phoneid);
 
735,8 → 734,8
};
 
next_thread_id = 1;
paused = false;
cev_valid = false;
paused = 0;
cev_valid = 0;
 
fibril_mutex_initialize(&state_lock);
fibril_condvar_initialize(&state_cv);
862,7 → 861,7
--argc; ++argv;
task_id = strtol(*argv, &err_p, 10);
task_ldr = NULL;
task_wait_for = false;
task_wait_for = 0;
if (*err_p) {
printf("Task ID syntax error\n");
print_syntax();
900,7 → 899,7
while (*cp) printf("'%s'\n", *cp++);
}
task_ldr = preload_task(*argv, argv, &task_id);
task_wait_for = true;
task_wait_for = 1;
 
return 0;
}