X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.c;h=e8bc78c13561aafd6311f11754c85094152ca5bc;hb=51304ed88a4f30a1952287360f3c9ff9a0aa1f64;hp=07ecfc46603e30cd67d76d11d5f141fb182e945e;hpb=c0cb4d12b6441b5964a5017e8c58349bec15e7b8;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c index 07ecfc46..e8bc78c1 100644 --- a/ltt/branches/poly/lttv/lttv/state.c +++ b/ltt/branches/poly/lttv/lttv/state.c @@ -78,6 +78,7 @@ GQuark LTT_FIELD_PID, LTT_FIELD_FILENAME, LTT_FIELD_NAME, + LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE, LTT_FIELD_STATUS, @@ -106,6 +107,10 @@ LttvProcessStatus LTTV_STATE_RUN, LTTV_STATE_DEAD; +LttvProcessType + LTTV_STATE_USER_THREAD, + LTTV_STATE_KERNEL_THREAD; + static GQuark LTTV_STATE_TRACEFILES, LTTV_STATE_PROCESSES, @@ -198,6 +203,8 @@ restore_init_state(LttvTraceState *self) guint i, nb_cpus; LttvTracefileState *tfcs; + + LttTime start_time, end_time; /* Free the process tables */ if(self->processes != NULL) lttv_state_free_process_table(self->processes); @@ -213,6 +220,7 @@ restore_init_state(LttvTraceState *self) //g_tree_destroy(self->parent.ts_context->pqueue); //self->parent.ts_context->pqueue = g_tree_new(compare_tracefile); + ltt_trace_time_span_get(self->parent.t, &start_time, &end_time); //lttv_process_trace_seek_time(&self->parent, ltt_time_zero); @@ -221,7 +229,7 @@ restore_init_state(LttvTraceState *self) /* Put the per cpu running_process to beginning state : process 0. */ for(i=0; i< nb_cpus; i++) { self->running_process[i] = lttv_state_create_process(self, NULL, i, 0, - LTTV_STATE_UNNAMED, <t_time_zero); + LTTV_STATE_UNNAMED, &start_time); self->running_process[i]->state->s = LTTV_STATE_RUN; self->running_process[i]->cpu = i; } @@ -412,8 +420,9 @@ static void write_process_state(gpointer key, gpointer value, process = (LttvProcessState *)value; fprintf(fp, -" \n", - process, process->pid, process->ppid, process->creation_time.tv_sec, +" \n", + process, process->pid, process->ppid, g_quark_to_string(process->type), + process->creation_time.tv_sec, process->creation_time.tv_nsec, g_quark_to_string(process->name), process->cpu); @@ -510,8 +519,7 @@ static void copy_process_state(gpointer key, gpointer value,gpointer user_data) g_array_index(new_process->user_stack, guint64, i) = g_array_index(process->user_stack, guint64, i); } - new_process->current_function = &g_array_index(new_process->user_stack, - guint64, new_process->user_stack->len - 1); + new_process->current_function = process->current_function; g_hash_table_insert(new_processes, new_process, new_process); } @@ -821,8 +829,9 @@ free_max_time(LttvTraceState *tcs) typedef struct _LttvNameTables { // FIXME GQuark *eventtype_names; GQuark *syscall_names; - guint nb_syscalls; + guint nb_syscalls; GQuark *trap_names; + guint nb_traps; GQuark *irq_names; GQuark *soft_irq_names; } LttvNameTables; @@ -865,85 +874,92 @@ create_name_tables(LttvTraceState *tcs) name_tables->eventtype_names[i] = g_quark_from_string(fe_name->str); } #endif //0 - if(lttv_trace_find_hook(tcs->parent.t, + if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY, LTT_FIELD_SYSCALL_ID, 0, 0, - NULL, NULL, &h)) - return; - - thf = lttv_trace_hook_get_first(&h); - - t = ltt_field_type(thf->f1); - nb = ltt_type_element_number(t); - - lttv_trace_hook_destroy(&h); + NULL, NULL, &h)) { + + thf = lttv_trace_hook_get_first(&h); + + t = ltt_field_type(thf->f1); + nb = ltt_type_element_number(t); + + lttv_trace_hook_destroy(&h); - name_tables->syscall_names = g_new(GQuark, nb); - name_tables->nb_syscalls = nb; + name_tables->syscall_names = g_new(GQuark, nb); + name_tables->nb_syscalls = nb; - for(i = 0 ; i < nb ; i++) { - name_tables->syscall_names[i] = ltt_enum_string_get(t, i); - } + for(i = 0 ; i < nb ; i++) { + name_tables->syscall_names[i] = ltt_enum_string_get(t, i); + } - //name_tables->syscall_names = g_new(GQuark, 256); - //for(i = 0 ; i < 256 ; i++) { - // g_string_printf(fe_name, "syscall %d", i); - // name_tables->syscall_names[i] = g_quark_from_string(fe_name->str); - //} + //name_tables->syscall_names = g_new(GQuark, 256); + //for(i = 0 ; i < 256 ; i++) { + // g_string_printf(fe_name, "syscall %d", i); + // name_tables->syscall_names[i] = g_quark_from_string(fe_name->str); + //} + } else { + name_tables->syscall_names = NULL; + name_tables->nb_syscalls = 0; + } - if(lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL, + if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, LTT_FIELD_TRAP_ID, 0, 0, - NULL, NULL, &h)) - return; + NULL, NULL, &h)) { - thf = lttv_trace_hook_get_first(&h); + thf = lttv_trace_hook_get_first(&h); - t = ltt_field_type(thf->f1); - //nb = ltt_type_element_number(t); + t = ltt_field_type(thf->f1); + //nb = ltt_type_element_number(t); - lttv_trace_hook_destroy(&h); - - /* - name_tables->trap_names = g_new(GQuark, nb); - for(i = 0 ; i < nb ; i++) { - name_tables->trap_names[i] = g_quark_from_string( - ltt_enum_string_get(t, i)); - } - */ + lttv_trace_hook_destroy(&h); - name_tables->trap_names = g_new(GQuark, 256); - for(i = 0 ; i < 256 ; i++) { - g_string_printf(fe_name, "trap %d", i); - name_tables->trap_names[i] = g_quark_from_string(fe_name->str); - } + /* + name_tables->trap_names = g_new(GQuark, nb); + for(i = 0 ; i < nb ; i++) { + name_tables->trap_names[i] = g_quark_from_string( + ltt_enum_string_get(t, i)); + } + */ + name_tables->nb_traps = 256; + name_tables->trap_names = g_new(GQuark, 256); + for(i = 0 ; i < 256 ; i++) { + g_string_printf(fe_name, "trap %d", i); + name_tables->trap_names[i] = g_quark_from_string(fe_name->str); + } + } else { + name_tables->trap_names = NULL; + name_tables->nb_traps = 0; + } - if(lttv_trace_find_hook(tcs->parent.t, + if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY, LTT_FIELD_IRQ_ID, 0, 0, - NULL, NULL, &h)) - return; - - thf = lttv_trace_hook_get_first(&h); - - t = ltt_field_type(thf->f1); - //nb = ltt_type_element_number(t); - - lttv_trace_hook_destroy(&h); + NULL, NULL, &h)) { + + thf = lttv_trace_hook_get_first(&h); + + t = ltt_field_type(thf->f1); + //nb = ltt_type_element_number(t); - /* - name_tables->irq_names = g_new(GQuark, nb); - for(i = 0 ; i < nb ; i++) { - name_tables->irq_names[i] = g_quark_from_string(ltt_enum_string_get(t, i)); - } - */ + lttv_trace_hook_destroy(&h); - name_tables->irq_names = g_new(GQuark, 256); - for(i = 0 ; i < 256 ; i++) { - g_string_printf(fe_name, "irq %d", i); - name_tables->irq_names[i] = g_quark_from_string(fe_name->str); - } + /* + name_tables->irq_names = g_new(GQuark, nb); + for(i = 0 ; i < nb ; i++) { + name_tables->irq_names[i] = g_quark_from_string(ltt_enum_string_get(t, i)); + } + */ + name_tables->irq_names = g_new(GQuark, 256); + for(i = 0 ; i < 256 ; i++) { + g_string_printf(fe_name, "irq %d", i); + name_tables->irq_names[i] = g_quark_from_string(fe_name->str); + } + } else { + name_tables->irq_names = NULL; + } /* name_tables->soft_irq_names = g_new(GQuark, nb); for(i = 0 ; i < nb ; i++) { @@ -977,6 +993,7 @@ get_name_tables(LttvTraceState *tcs) tcs->syscall_names = name_tables->syscall_names; tcs->nb_syscalls = name_tables->nb_syscalls; tcs->trap_names = name_tables->trap_names; + tcs->nb_traps = name_tables->nb_traps; tcs->irq_names = name_tables->irq_names; tcs->soft_irq_names = name_tables->soft_irq_names; } @@ -995,11 +1012,11 @@ free_name_tables(LttvTraceState *tcs) *(v.v_pointer) = NULL; // g_free(name_tables->eventtype_names); - g_free(name_tables->syscall_names); - g_free(name_tables->trap_names); - g_free(name_tables->irq_names); - g_free(name_tables->soft_irq_names); - g_free(name_tables); + if(name_tables->syscall_names) g_free(name_tables->syscall_names); + if(name_tables->trap_names) g_free(name_tables->trap_names); + if(name_tables->irq_names) g_free(name_tables->irq_names); + if(name_tables->soft_irq_names) g_free(name_tables->soft_irq_names); + if(name_tables) g_free(name_tables); } #ifdef HASH_TABLE_DEBUG @@ -1046,10 +1063,33 @@ static void push_state(LttvTracefileState *tfs, LttvExecutionMode t, es->t = t; es->n = state_id; es->entry = es->change = tfs->parent.timestamp; + es->cum_cpu_time = ltt_time_zero; es->s = process->state->s; process->state = es; } +/* pop state + * return 1 when empty, else 0 */ +int lttv_state_pop_state_cleanup(LttvProcessState *process, + LttvTracefileState *tfs) +{ + guint cpu = tfs->cpu; + LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context; + + guint depth = process->execution_stack->len; + + if(depth == 1){ + return 1; + } + + process->execution_stack = + g_array_set_size(process->execution_stack, depth - 1); + process->state = &g_array_index(process->execution_stack, LttvExecutionState, + depth - 2); + process->state->change = tfs->parent.timestamp; + + return 0; +} static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t) { @@ -1155,7 +1195,7 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, process->name = name; //process->last_cpu = tfs->cpu_name; //process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf); - process->kernel_thread = 0; + process->type = LTTV_STATE_USER_THREAD; process->usertrace = ltt_state_usertrace_find(tcs, pid, timestamp); process->current_function = 0; //function 0x0 by default. @@ -1193,6 +1233,7 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, es->entry = *timestamp; //g_assert(timestamp->tv_sec != 0); es->change = *timestamp; + es->cum_cpu_time = ltt_time_zero; es->s = LTTV_STATE_RUN; es = process->state = &g_array_index(process->execution_stack, @@ -1202,6 +1243,7 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, es->entry = *timestamp; //g_assert(timestamp->tv_sec != 0); es->change = *timestamp; + es->cum_cpu_time = ltt_time_zero; es->s = LTTV_STATE_WAIT_FORK; /* Allocate an empty function call stack. If it's empty, use 0x0. */ @@ -1323,8 +1365,19 @@ static gboolean trap_entry(void *hook_data, void *call_data) LttvExecutionSubmode submode; - submode = ((LttvTraceState *)(s->parent.t_context))->trap_names[ - ltt_event_get_unsigned(e, f)]; + guint nb_traps = ((LttvTraceState *)(s->parent.t_context))->nb_traps; + guint trap = ltt_event_get_unsigned(e, f); + + if(trap < nb_traps) { + submode = ((LttvTraceState *)(s->parent.t_context))->trap_names[trap]; + } else { + /* Fixup an incomplete trap table */ + GString *string = g_string_new(""); + g_string_printf(string, "trap %u", trap); + submode = g_quark_from_string(string->str); + g_string_free(string, TRUE); + } + push_state(s, LTTV_STATE_TRAP, submode); return FALSE; } @@ -1416,8 +1469,7 @@ static void push_function(LttvTracefileState *tfs, guint64 funcptr) new_func = &g_array_index(process->user_stack, guint64, depth); *new_func = funcptr; - process->current_function = - g_array_index(process->user_stack, guint64, depth - 1); + process->current_function = funcptr; } static void pop_function(LttvTracefileState *tfs, guint64 funcptr) @@ -1426,7 +1478,6 @@ static void pop_function(LttvTracefileState *tfs, guint64 funcptr) LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context; LttvProcessState *process = ts->running_process[cpu]; - guint depth = process->user_stack->len; if(process->current_function != funcptr){ g_info("Different functions (%lu.%09lu): ignore it\n", tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec); @@ -1439,6 +1490,7 @@ static void pop_function(LttvTracefileState *tfs, guint64 funcptr) g_quark_to_string(process->state->s)); return; } + guint depth = process->user_stack->len; if(depth == 0){ g_info("Trying to pop last function on stack (%lu.%09lu): ignore it\n", @@ -1626,7 +1678,7 @@ static gboolean process_kernel_thread(void *hook_data, void *call_data) process = lttv_state_find_process(ts, ANY_CPU, pid); es = &g_array_index(process->execution_stack, LttvExecutionState, 0); es->t = LTTV_STATE_SYSCALL; - process->kernel_thread = 1; + process->type = LTTV_STATE_KERNEL_THREAD; return FALSE; } @@ -1740,8 +1792,9 @@ static gboolean enum_process_state(void *hook_data, void *call_data) LttvTraceState *ts = (LttvTraceState*)s->parent.t_context; LttvProcessState *process = ts->running_process[cpu]; LttvProcessState *parent_process; - LttField *f4, *f5, *f6; - GQuark mode, submode, status; + LttField *f4, *f5, *f6, *f7; + GQuark type, mode, submode, status; + LttvExecutionState *es; /* PID */ pid = ltt_event_get_unsigned(e, thf->f1); @@ -1752,21 +1805,26 @@ static gboolean enum_process_state(void *hook_data, void *call_data) /* Command name */ command = ltt_event_get_string(e, thf->f3); - /* mode */ - f4 = ltt_eventtype_field_by_name(et, LTT_FIELD_MODE); - mode = ltt_enum_string_get(ltt_field_type(f4), + /* type */ + f4 = ltt_eventtype_field_by_name(et, LTT_FIELD_TYPE); + type = ltt_enum_string_get(ltt_field_type(f4), ltt_event_get_unsigned(e, f4)); - /* submode */ - f5 = ltt_eventtype_field_by_name(et, LTT_FIELD_SUBMODE); - submode = ltt_enum_string_get(ltt_field_type(f5), + /* mode */ + f5 = ltt_eventtype_field_by_name(et, LTT_FIELD_MODE); + mode = ltt_enum_string_get(ltt_field_type(f5), ltt_event_get_unsigned(e, f5)); - /* status */ - f6 = ltt_eventtype_field_by_name(et, LTT_FIELD_STATUS); - status = ltt_enum_string_get(ltt_field_type(f6), + /* submode */ + f6 = ltt_eventtype_field_by_name(et, LTT_FIELD_SUBMODE); + submode = ltt_enum_string_get(ltt_field_type(f6), ltt_event_get_unsigned(e, f6)); + /* status */ + f7 = ltt_eventtype_field_by_name(et, LTT_FIELD_STATUS); + status = ltt_enum_string_get(ltt_field_type(f7), + ltt_event_get_unsigned(e, f7)); + /* The process might exist if a process was forked while performing the sate dump. */ process = lttv_state_find_process(ts, ANY_CPU, pid); if(process == NULL) { @@ -1776,38 +1834,44 @@ static gboolean enum_process_state(void *hook_data, void *call_data) &s->parent.timestamp); /* Keep the stack bottom : a running user mode */ -#if 0 /* Disabled because of inconsistencies in the current statedump states. */ - if(mode == LTTV_STATE_USER_MODE) { + if(type == LTTV_STATE_KERNEL_THREAD) { /* Only keep the bottom */ 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; + es->s = status; + es->n = submode; } else { /* On top of it : */ - LttvExecutionState *es; es = process->state = &g_array_index(process->execution_stack, LttvExecutionState, 1); - es->t = mode; + es->t = LTTV_STATE_USER_MODE; es->s = status; es->n = submode; } -#endif //0 - +#if 0 /* UNKNOWN STATE */ { - LttvExecutionState *es; es = process->state = &g_array_index(process->execution_stack, LttvExecutionState, 1); es->t = LTTV_STATE_MODE_UNKNOWN; es->s = LTTV_STATE_UNNAMED; es->n = LTTV_STATE_SUBMODE_UNKNOWN; } +#endif //0 } else { /* The process has already been created : * Probably was forked while dumping the process state or * was simply scheduled in prior to get the state dump event. + * We know for sure if it is a user space thread. */ process->ppid = parent_pid; process->name = g_quark_from_string(command); + es = &g_array_index(process->execution_stack, LttvExecutionState, 0); + if(type != LTTV_STATE_KERNEL_THREAD) + es->t = LTTV_STATE_USER_MODE; /* Don't mess around with the stack, it will eventually become * ok after the end of state dump. */ } @@ -2593,7 +2657,7 @@ lttv_tracefile_state_get_type(void) static void module_init() { - LTTV_STATE_UNNAMED = g_quark_from_string("unnamed"); + LTTV_STATE_UNNAMED = g_quark_from_string("UNNAMED"); LTTV_STATE_MODE_UNKNOWN = g_quark_from_string("MODE_UNKNOWN"); LTTV_STATE_USER_MODE = g_quark_from_string("USER_MODE"); LTTV_STATE_SYSCALL = g_quark_from_string("SYSCALL"); @@ -2609,6 +2673,8 @@ static void module_init() LTTV_STATE_WAIT = g_quark_from_string("WAIT"); LTTV_STATE_RUN = g_quark_from_string("RUN"); LTTV_STATE_DEAD = g_quark_from_string("DEAD"); + LTTV_STATE_USER_THREAD = g_quark_from_string("USER_THREAD"); + LTTV_STATE_KERNEL_THREAD = g_quark_from_string("KERNEL_THREAD"); LTTV_STATE_TRACEFILES = g_quark_from_string("tracefiles"); LTTV_STATE_PROCESSES = g_quark_from_string("processes"); LTTV_STATE_PROCESS = g_quark_from_string("process"); @@ -2662,6 +2728,7 @@ static void module_init() LTT_FIELD_PID = g_quark_from_string("pid"); LTT_FIELD_FILENAME = g_quark_from_string("filename"); LTT_FIELD_NAME = g_quark_from_string("name"); + LTT_FIELD_TYPE = g_quark_from_string("type"); LTT_FIELD_MODE = g_quark_from_string("mode"); LTT_FIELD_SUBMODE = g_quark_from_string("submode"); LTT_FIELD_STATUS = g_quark_from_string("status");