LTTV_STATE_RESOURCE_CPUS_COUNT,
LTTV_STATE_RESOURCE_IRQS,
LTTV_STATE_RESOURCE_SOFT_IRQS,
+ LTTV_STATE_RESOURCE_TRAPS,
LTTV_STATE_RESOURCE_BLKDEVS;
static void create_max_time(LttvTraceState *tcs);
static void
restore_init_state(LttvTraceState *self)
{
- guint i, nb_cpus, nb_irqs, nb_soft_irqs;
+ guint i, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
//LttvTracefileState *tfcs;
nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
nb_irqs = self->nb_irqs;
nb_soft_irqs = self->nb_soft_irqs;
+ nb_traps = self->nb_traps;
/* Put the per cpu running_process to beginning state : process 0. */
for(i=0; i< nb_cpus; i++) {
self->soft_irq_states[i].running = 0;
}
+ /* reset trap states */
+ for(i=0; i<nb_traps; i++) {
+ self->trap_states[i].running = 0;
+ }
+
/* reset bdev states */
g_hash_table_foreach(self->bdev_states, bdevstate_free_cb, NULL);
//g_hash_table_steal_all(self->bdev_states);
/* the kernel has a statically fixed max of 32 softirqs */
tcs->soft_irq_states = g_new(LttvSoftIRQState, tcs->nb_soft_irqs);
+ /* init trap stuff */
+ tcs->trap_states = g_new(LttvTrapState, tcs->nb_traps);
+
/* init bdev resource stuff */
tcs->bdev_states = g_hash_table_new(g_int_hash, g_int_equal);
process = (LttvProcessState *)value;
fprintf(fp,
-" <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\">\n",
+" <PROCESS CORE=%p PID=%u TGID=%u PPID=%u TYPE=\"%s\" CTIME_S=%lu CTIME_NS=%lu ITIME_S=%lu ITIME_NS=%lu NAME=\"%s\" BRAND=\"%s\" CPU=\"%u\" FREE_EVENTS=\"%u\">\n",
process, process->pid, process->tgid, process->ppid,
g_quark_to_string(process->type),
process->creation_time.tv_sec,
process->insertion_time.tv_nsec,
g_quark_to_string(process->name),
g_quark_to_string(process->brand),
- process->cpu);
+ process->cpu, process->free_events);
for(i = 0 ; i < process->execution_stack->len; i++) {
es = &g_array_index(process->execution_stack, LttvExecutionState, i);
//fputc('\0', fp);
fwrite(&process->brand, sizeof(process->brand), 1, fp);
fwrite(&process->pid, sizeof(process->pid), 1, fp);
+ fwrite(&process->free_events, sizeof(process->free_events), 1, fp);
fwrite(&process->tgid, sizeof(process->tgid), 1, fp);
fwrite(&process->ppid, sizeof(process->ppid), 1, fp);
fwrite(&process->cpu, sizeof(process->cpu), 1, fp);
fread(&tmp.name, sizeof(tmp.name), 1, fp);
fread(&tmp.brand, sizeof(tmp.brand), 1, fp);
fread(&tmp.pid, sizeof(tmp.pid), 1, fp);
+ fread(&tmp.free_events, sizeof(tmp.free_events), 1, fp);
fread(&tmp.tgid, sizeof(tmp.tgid), 1, fp);
fread(&tmp.ppid, sizeof(tmp.ppid), 1, fp);
fread(&tmp.cpu, sizeof(tmp.cpu), 1, fp);
(gchar*)g_ptr_array_index(quarktable, tmp.brand));
process->name =
g_quark_from_string((gchar*)g_ptr_array_index(quarktable, tmp.name));
-
+ process->free_events = tmp.free_events;
do {
if(feof(fp) || ferror(fp)) goto end_loop;
static LttvSoftIRQState *lttv_state_copy_soft_irq_states(LttvSoftIRQState *states, guint n)
{
- guint i,j;
+ guint i;
LttvSoftIRQState *retval;
retval = g_malloc(n*sizeof(LttvSoftIRQState));
return retval;
}
-static void lttv_state_free_soft_irq_states(LttvIRQState *states, guint n)
+static void lttv_state_free_soft_irq_states(LttvSoftIRQState *states, guint n)
+{
+ g_free(states);
+}
+
+static LttvTrapState *lttv_state_copy_trap_states(LttvTrapState *states, guint n)
+{
+ guint i;
+ LttvTrapState *retval;
+
+ retval = g_malloc(n*sizeof(LttvTrapState));
+
+ for(i=0; i<n; i++) {
+ retval[i].running = states[i].running;
+ }
+
+ return retval;
+}
+
+static void lttv_state_free_trap_states(LttvTrapState *states, guint n)
{
g_free(states);
}
static void state_save(LttvTraceState *self, LttvAttribute *container)
{
- guint i, nb_tracefile, nb_cpus, nb_irqs;
+ guint i, nb_tracefile, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
LttvTracefileState *tfcs;
}
/* save the soft irq state */
- nb_irqs = self->nb_irqs;
+ nb_soft_irqs = self->nb_soft_irqs;
{
value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_SOFT_IRQS,
LTTV_POINTER);
- *(value.v_pointer) = lttv_state_copy_soft_irq_states(self->soft_irq_states, nb_irqs);
+ *(value.v_pointer) = lttv_state_copy_soft_irq_states(self->soft_irq_states, nb_soft_irqs);
+ }
+
+ /* save the trap state */
+ nb_traps = self->nb_traps;
+ {
+ value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_TRAPS,
+ LTTV_POINTER);
+ *(value.v_pointer) = lttv_state_copy_trap_states(self->trap_states, nb_traps);
}
/* save the blkdev states */
static void state_restore(LttvTraceState *self, LttvAttribute *container)
{
- guint i, nb_tracefile, pid, nb_cpus, nb_irqs, nb_soft_irqs;
+ guint i, nb_tracefile, pid, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
LttvTracefileState *tfcs;
lttv_state_free_soft_irq_states(self->soft_irq_states, nb_soft_irqs);
self->soft_irq_states = lttv_state_copy_soft_irq_states(*(value.v_pointer), nb_soft_irqs);
+ /* restore trap resource states */
+ nb_traps = self->nb_traps;
+ type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_TRAPS, &value);
+ g_assert(type == LTTV_POINTER);
+ lttv_state_free_trap_states(self->trap_states, nb_traps);
+ self->trap_states = lttv_state_copy_trap_states(*(value.v_pointer), nb_traps);
+
/* restore the blkdev states */
type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
g_assert(type == LTTV_POINTER);
process->creation_time.tv_nsec);
process->pid_time = g_quark_from_string(buffer);
process->cpu = cpu;
+ process->free_events = 0;
//process->last_cpu = tfs->cpu_name;
//process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf);
process->execution_stack = g_array_sized_new(FALSE, FALSE,
static gboolean trap_entry(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
LttvTraceHook *th = (LttvTraceHook *)hook_data;
struct marker_field *f = lttv_trace_get_hook_field(th, 0);
/* update cpu status */
cpu_push_mode(s->cpu_state, LTTV_CPU_TRAP);
+ /* update trap status */
+ s->cpu_state->last_trap = trap;
+ ts->trap_states[trap].running++;
+
return FALSE;
}
static gboolean trap_exit(void *hook_data, void *call_data)
{
LttvTracefileState *s = (LttvTracefileState *)call_data;
+ LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
+ guint trap = s->cpu_state->last_trap;
pop_state(s, LTTV_STATE_TRAP);
/* update cpu status */
cpu_pop_mode(s->cpu_state);
+ /* update trap status */
+ if(ts->trap_states[trap].running)
+ ts->trap_states[trap].running--;
+
return FALSE;
}
process->state->change = s->parent.timestamp;
}
- if(state_out == 32 || state_out == 64)
- exit_process(s, process); /* EXIT_DEAD || TASK_DEAD */
- /* see sched.h for states */
+ if(state_out == 32 || state_out == 64) { /* EXIT_DEAD || TASK_DEAD */
+ /* see sched.h for states */
+ process->state->s = LTTV_STATE_DEAD;
+ process->state->change = s->parent.timestamp;
+ }
}
}
process = ts->running_process[cpu] =
*
* Simply put a correct parent.
*/
- g_assert(0); /* This is a problematic case : the process has been created
- before the fork event */
+ g_error("Process %u has been created before fork on cpu %u. Probably an unsynchronized TSC problem on the traced machine.", child_pid, cpu);
+ //g_assert(0); /* This is a problematic case : the process has been created
+ // before the fork event */
child_process->ppid = process->pid;
child_process->tgid = child_tgid;
}
process = lttv_state_find_process_or_create(ts, ANY_CPU, pid,
<t_time_zero);
- process->execution_stack =
- g_array_set_size(process->execution_stack, 1);
- es = process->state =
- &g_array_index(process->execution_stack, LttvExecutionState, 0);
- es->t = LTTV_STATE_SYSCALL;
+ if (process->state->s != LTTV_STATE_DEAD) {
+ process->execution_stack =
+ g_array_set_size(process->execution_stack, 1);
+ es = process->state =
+ &g_array_index(process->execution_stack, LttvExecutionState, 0);
+ es->t = LTTV_STATE_SYSCALL;
+ }
process->type = LTTV_STATE_KERNEL_THREAD;
return FALSE;
g_assert(release_pid != 0);
process = lttv_state_find_process(ts, ANY_CPU, release_pid);
-
- if(likely(process != NULL)) {
- /* release_task is happening at kernel level : we can now safely release
- * the data structure of the process */
- //This test is fun, though, as it may happen that
- //at time t : CPU 0 : process_free
- //at time t+150ns : CPU 1 : schedule out
- //Clearly due to time imprecision, we disable it. (Mathieu)
- //If this weird case happen, we have no choice but to put the
- //Currently running process on the cpu to 0.
- //I re-enable it following time precision fixes. (Mathieu)
- //Well, in the case where an process is freed by a process on another CPU
- //and still scheduled, it happens that this is the schedchange that will
- //drop the last reference count. Do not free it here!
- guint num_cpus = ltt_trace_get_num_cpu(ts->parent.t);
- guint i;
- for(i=0; i< num_cpus; i++) {
- //g_assert(process != ts->running_process[i]);
- if(process == ts->running_process[i]) {
- //ts->running_process[i] = lttv_state_find_process(ts, i, 0);
- break;
- }
- }
- if(i == num_cpus) /* process is not scheduled */
- exit_process(s, process);
- }
+ if(likely(process != NULL))
+ exit_process(s, process);
return FALSE;
}
LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu count");
LTTV_STATE_RESOURCE_IRQS = g_quark_from_string("irq resource states");
LTTV_STATE_RESOURCE_SOFT_IRQS = g_quark_from_string("soft irq resource states");
+ LTTV_STATE_RESOURCE_TRAPS = g_quark_from_string("trap resource states");
LTTV_STATE_RESOURCE_BLKDEVS = g_quark_from_string("blkdevs resource states");
projects / lttv.git / blobdiff