X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.c;h=a3a3102a50039a3adbb2e7c58003bbd07c5f2046;hb=f82dffaef20dd0a80565842bf20b9de428850035;hp=05ea74f1d866993b9f7dd02a2d17c3a422aed4d4;hpb=83e160f2269f77a175b026a4b008a6dd18533d93;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c index 05ea74f1..a3a3102a 100644 --- a/ltt/branches/poly/lttv/lttv/state.c +++ b/ltt/branches/poly/lttv/lttv/state.c @@ -61,7 +61,8 @@ GQuark LTT_EVENT_EXEC, LTT_EVENT_ENUM_PROCESS_STATE, LTT_EVENT_FUNCTION_ENTRY, - LTT_EVENT_FUNCTION_EXIT; + LTT_EVENT_FUNCTION_EXIT, + LTT_EVENT_THREAD_BRAND; /* Fields Quarks */ @@ -99,6 +100,7 @@ LttvExecutionSubmode LttvProcessStatus LTTV_STATE_UNNAMED, + LTTV_STATE_UNBRANDED, LTTV_STATE_WAIT_FORK, LTTV_STATE_WAIT_CPU, LTTV_STATE_EXIT, @@ -203,6 +205,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); @@ -218,6 +222,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); @@ -226,7 +231,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; } @@ -417,10 +422,11 @@ static void write_process_state(gpointer key, gpointer value, process = (LttvProcessState *)value; fprintf(fp, -" \n", +" \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), + g_quark_to_string(process->brand), process->cpu); for(i = 0 ; i < process->execution_stack->len; i++) { @@ -826,8 +832,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; @@ -918,7 +925,7 @@ create_name_tables(LttvTraceState *tcs) 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); @@ -926,6 +933,7 @@ create_name_tables(LttvTraceState *tcs) } } else { name_tables->trap_names = NULL; + name_tables->nb_traps = 0; } if(!lttv_trace_find_hook(tcs->parent.t, @@ -988,6 +996,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; } @@ -1099,10 +1108,11 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t) g_info("process state has %s when pop_int is %s\n", g_quark_to_string(process->state->t), g_quark_to_string(t)); - g_info("{ %u, %u, %s, %s }\n", + g_info("{ %u, %u, %s, %s, %s }\n", process->pid, process->ppid, g_quark_to_string(process->name), + g_quark_to_string(process->brand), g_quark_to_string(process->state->s)); return; } @@ -1187,6 +1197,7 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent, process->pid = pid; process->cpu = cpu; process->name = name; + process->brand = LTTV_STATE_UNBRANDED; //process->last_cpu = tfs->cpu_name; //process->last_cpu_index = ltt_tracefile_num(((LttvTracefileContext*)tfs)->tf); process->type = LTTV_STATE_USER_THREAD; @@ -1359,8 +1370,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)]; + guint64 nb_traps = ((LttvTraceState *)(s->parent.t_context))->nb_traps; + guint64 trap = ltt_event_get_long_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; } @@ -1430,7 +1452,7 @@ static gboolean soft_irq_entry(void *hook_data, void *call_data) LttvExecutionSubmode submode; submode = ((LttvTraceState *)(s->parent.t_context))->soft_irq_names[ - ltt_event_get_unsigned(e, f)]; + ltt_event_get_long_unsigned(e, f)]; /* Do something with the info about being in user or system mode when int? */ push_state(s, LTTV_STATE_SOFT_IRQ, submode); @@ -1466,10 +1488,11 @@ static void pop_function(LttvTracefileState *tfs, guint64 funcptr) tfs->parent.timestamp.tv_sec, tfs->parent.timestamp.tv_nsec); g_info("process state has %llu when pop_function is %llu\n", process->current_function, funcptr); - g_info("{ %u, %u, %s, %s }\n", + g_info("{ %u, %u, %s, %s, %s }\n", process->pid, process->ppid, g_quark_to_string(process->name), + g_quark_to_string(process->brand), g_quark_to_string(process->state->s)); return; } @@ -1675,13 +1698,14 @@ static gboolean process_exit(void *hook_data, void *call_data) guint pid; guint cpu = s->cpu; LttvTraceState *ts = (LttvTraceState*)s->parent.t_context; - LttvProcessState *process = ts->running_process[cpu]; + LttvProcessState *process; // = ts->running_process[cpu]; pid = ltt_event_get_unsigned(e, thf->f1); // FIXME : Add this test in the "known state" section // g_assert(process->pid == pid); + process = lttv_state_find_process(ts, ANY_CPU, pid); if(likely(process != NULL)) { process->state->s = LTTV_STATE_EXIT; } @@ -1726,9 +1750,8 @@ static gboolean process_free(void *hook_data, void *call_data) break; } } - //if(i == num_cpus) /* process is not scheduled */ - //exit_process(s, process); // do nothing : wait for the schedchange to - //delete the process. + if(i == num_cpus) /* process is not scheduled */ + exit_process(s, process); } return FALSE; @@ -1760,6 +1783,22 @@ static gboolean process_exec(void *hook_data, void *call_data) return FALSE; } +static gboolean thread_brand(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); + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data; + gchar *name; + guint cpu = s->cpu; + LttvProcessState *process = ts->running_process[cpu]; + + name = ltt_event_get_string(e, thf->f1); + process->brand = g_quark_from_string(name); + + return FALSE; +} + static gboolean enum_process_state(void *hook_data, void *call_data) { LttvTracefileState *s = (LttvTracefileState *)call_data; @@ -1899,8 +1938,8 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) /* Find the eventtype id for the following events and register the associated by id hooks. */ - hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 17); - hooks = g_array_set_size(hooks, 17); // Max possible number of hooks. + hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18); + hooks = g_array_set_size(hooks, 18); // Max possible number of hooks. hn = 0; ret = lttv_trace_find_hook(ts->parent.t, @@ -1988,6 +2027,12 @@ void lttv_state_add_event_hooks(LttvTracesetState *self) process_exec, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_USER_GENERIC, LTT_EVENT_THREAD_BRAND, + LTT_FIELD_NAME, 0, 0, + thread_brand, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + /* statedump-related hooks */ ret = lttv_trace_find_hook(ts->parent.t, LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, @@ -2641,6 +2686,7 @@ lttv_tracefile_state_get_type(void) static void module_init() { LTTV_STATE_UNNAMED = g_quark_from_string("UNNAMED"); + LTTV_STATE_UNBRANDED = g_quark_from_string("UNBRANDED"); 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"); @@ -2697,6 +2743,7 @@ static void module_init() LTT_EVENT_ENUM_PROCESS_STATE = g_quark_from_string("enumerate_process_state"); LTT_EVENT_FUNCTION_ENTRY = g_quark_from_string("function_entry"); LTT_EVENT_FUNCTION_EXIT = g_quark_from_string("function_exit"); + LTT_EVENT_THREAD_BRAND = g_quark_from_string("thread_brand"); LTT_FIELD_SYSCALL_ID = g_quark_from_string("syscall_id");