X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=875c1683d93c815985a90bb08320653a60925865;hb=b49e54b4abd9105b9904e050656b4a9981bdd064;hp=678978d7fca773309dd956d40b839a34e9ef0409;hpb=348c6ba830cba63cc5486e2cea042c8a70cf1fb2;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index 678978d7..875c1683 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -31,6 +31,7 @@ #include #define BUF_SIZE 256 +#define MAX_64_HEX_STRING_LEN 19 GQuark LTTV_STATS_PROCESS_UNKNOWN, @@ -39,27 +40,28 @@ GQuark LTTV_STATS_MODE_TYPES, LTTV_STATS_MODES, LTTV_STATS_SUBMODES, + LTTV_STATS_FUNCTIONS, LTTV_STATS_EVENT_TYPES, LTTV_STATS_CPU_TIME, + LTTV_STATS_CUMULATIVE_CPU_TIME, LTTV_STATS_ELAPSED_TIME, LTTV_STATS_EVENTS, LTTV_STATS_EVENTS_COUNT, LTTV_STATS_USE_COUNT, LTTV_STATS, LTTV_STATS_TRACEFILES, - LTTV_STATS_SUMMED; - -static GQuark + LTTV_STATS_SUMMED, LTTV_STATS_BEFORE_HOOKS, LTTV_STATS_AFTER_HOOKS; static void -find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, GQuark cpu, +find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, guint cpu, + guint64 function, GQuark mode, GQuark sub_mode, LttvAttribute **events_tree, LttvAttribute **event_types_tree); -static void -init(LttvTracesetStats *self, LttvTraceset *ts) + +static void lttv_stats_init(LttvTracesetStats *self) { guint i, j, nb_trace, nb_tracefile; @@ -80,8 +82,7 @@ init(LttvTracesetStats *self, LttvTraceset *ts) *stats_tree, *tracefiles_stats; - LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))-> - init((LttvTracesetContext *)self, ts); + LttvTraceset *ts = self->parent.parent.ts; self->stats = lttv_attribute_find_subdir( lttv_traceset_attribute(self->parent.parent.ts), @@ -90,7 +91,7 @@ init(LttvTracesetStats *self, LttvTraceset *ts) LTTV_STATS_USE_COUNT, LTTV_UINT, &v); - *(v.v_uint)++; + (*(v.v_uint))++; if(*(v.v_uint) == 1) { g_assert(lttv_attribute_get_number(self->stats) == 0); } @@ -107,7 +108,7 @@ init(LttvTracesetStats *self, LttvTraceset *ts) lttv_attribute_find(tcs->parent.parent.t_a, LTTV_STATS_USE_COUNT, LTTV_UINT, &v); - *(v.v_uint)++; + (*(v.v_uint))++; if(*(v.v_uint) == 1) { g_assert(lttv_attribute_get_number(tcs->stats) == 0); } @@ -120,17 +121,19 @@ init(LttvTracesetStats *self, LttvTraceset *ts) tfcs = LTTV_TRACEFILE_STATS(*tfs); tfcs->stats = lttv_attribute_find_subdir(tracefiles_stats, ltt_tracefile_long_name(tfcs->parent.parent.tf)); + guint cpu = tfcs->parent.cpu; find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN, - ltt_tracefile_long_name(tfcs->parent.parent.tf), + cpu, + 0x0ULL, LTTV_STATE_MODE_UNKNOWN, LTTV_STATE_SUBMODE_UNKNOWN, &tfcs->current_events_tree, &tfcs->current_event_types_tree); } } + } -static void -fini(LttvTracesetStats *self) +static void lttv_stats_fini(LttvTracesetStats *self) { guint i, j, nb_trace, nb_tracefile; @@ -152,7 +155,7 @@ fini(LttvTracesetStats *self) lttv_attribute_find(self->parent.parent.ts_a, LTTV_STATS_USE_COUNT, LTTV_UINT, &v); - *(v.v_uint)--; + (*(v.v_uint))--; if(*(v.v_uint) == 0) { lttv_attribute_remove_by_name(self->parent.parent.ts_a, LTTV_STATS); @@ -167,7 +170,7 @@ fini(LttvTracesetStats *self) lttv_attribute_find(tcs->parent.parent.t_a, LTTV_STATS_USE_COUNT, LTTV_UINT, &v); - *(v.v_uint)--; + (*(v.v_uint))--; if(*(v.v_uint) == 0) { lttv_attribute_remove_by_name(tcs->parent.parent.t_a,LTTV_STATS); @@ -189,6 +192,32 @@ fini(LttvTracesetStats *self) tfcs->current_event_types_tree = NULL; } } +} + + +void lttv_stats_reset(LttvTracesetStats *self) +{ + lttv_stats_fini(self); + lttv_stats_init(self); +} + + + +static void +init(LttvTracesetStats *self, LttvTraceset *ts) +{ + LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))-> + init((LttvTracesetContext *)self, ts); + + lttv_stats_init(self); +} + + +static void +fini(LttvTracesetStats *self) +{ + lttv_stats_fini(self); + LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))-> fini((LttvTracesetContext *)self); } @@ -368,19 +397,29 @@ lttv_tracefile_stats_get_type(void) static void find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, - GQuark cpu, + guint cpu, + guint64 function, GQuark mode, GQuark sub_mode, LttvAttribute **events_tree, LttvAttribute **event_types_tree) { - LttvAttribute *a; + LttvAttribute *a, *prev_a; + gchar fstring[MAX_64_HEX_STRING_LEN]; + gint ret; + + ret = snprintf(fstring, MAX_64_HEX_STRING_LEN-1, + "0x%llX", function) > 0; + g_assert(ret > 0); + fstring[MAX_64_HEX_STRING_LEN-1] = '\0'; LttvTraceStats *tcs = (LttvTraceStats*)tfcs->parent.parent.t_context; a = lttv_attribute_find_subdir(tcs->stats, LTTV_STATS_PROCESSES); a = lttv_attribute_find_subdir(a, pid_time); a = lttv_attribute_find_subdir(a, LTTV_STATS_CPU); - a = lttv_attribute_find_subdir(a, cpu); + a = lttv_attribute_find_subdir_unnamed(a, cpu); + a = lttv_attribute_find_subdir(a, LTTV_STATS_FUNCTIONS); + a = lttv_attribute_find_subdir(a, g_quark_from_string(fstring)); a = lttv_attribute_find_subdir(a, LTTV_STATS_MODE_TYPES); a = lttv_attribute_find_subdir(a, mode); a = lttv_attribute_find_subdir(a, LTTV_STATS_SUBMODES); @@ -394,12 +433,13 @@ find_event_tree(LttvTracefileStats *tfcs, static void update_event_tree(LttvTracefileStats *tfcs) { LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; - guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf); + guint cpu = tfcs->parent.cpu; LttvProcessState *process = ts->running_process[cpu]; LttvExecutionState *es = process->state; find_event_tree(tfcs, process->pid_time, - ltt_tracefile_long_name(tfcs->parent.parent.tf), + cpu, + process->current_function, es->t, es->n, &(tfcs->current_events_tree), &(tfcs->current_event_types_tree)); } @@ -408,26 +448,31 @@ static void update_event_tree(LttvTracefileStats *tfcs) static void mode_change(LttvTracefileStats *tfcs) { LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; - guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf); + guint cpu = tfcs->parent.cpu; LttvProcessState *process = ts->running_process[cpu]; - LttvAttributeValue cpu_time; + LttvAttributeValue cpu_time, cum_cpu_time; LttTime delta; - lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME, - LTTV_TIME, &cpu_time); delta = ltt_time_sub(tfcs->parent.parent.timestamp, process->state->change); + + lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME, + LTTV_TIME, &cpu_time); *(cpu_time.v_time) = ltt_time_add(*(cpu_time.v_time), delta); -} + process->state->cum_cpu_time = ltt_time_add(process->state->cum_cpu_time, + delta); +} +/* Note : every mode_end must come with a cumulative cpu time update in the + * after hook */ static void mode_end(LttvTracefileStats *tfcs) { LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; - guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf); + guint cpu = tfcs->parent.cpu; LttvProcessState *process = ts->running_process[cpu]; - LttvAttributeValue elapsed_time, cpu_time; + LttvAttributeValue elapsed_time, cpu_time, cum_cpu_time; LttTime delta; @@ -442,9 +487,34 @@ static void mode_end(LttvTracefileStats *tfcs) delta = ltt_time_sub(tfcs->parent.parent.timestamp, process->state->change); *(cpu_time.v_time) = ltt_time_add(*(cpu_time.v_time), delta); + process->state->cum_cpu_time = ltt_time_add(process->state->cum_cpu_time, + delta); + + lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CUMULATIVE_CPU_TIME, + LTTV_TIME, &cum_cpu_time); + *(cum_cpu_time.v_time) = ltt_time_add(*(cum_cpu_time.v_time), + process->state->cum_cpu_time); } +static void after_mode_end(LttvTracefileStats *tfcs) +{ + LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; + guint cpu = tfcs->parent.cpu; + LttvProcessState *process = ts->running_process[cpu]; + LttvAttributeValue cum_cpu_time; + + LttTime nested_delta; + + nested_delta = process->state->cum_cpu_time; + process->state->cum_cpu_time = ltt_time_zero; /* For after traceset hook */ + + update_event_tree(tfcs); + + process->state->cum_cpu_time = ltt_time_add(process->state->cum_cpu_time, + nested_delta); +} + static gboolean before_syscall_entry(void *hook_data, void *call_data) { mode_change((LttvTracefileStats *)call_data); @@ -468,7 +538,7 @@ gboolean before_syscall_exit(void *hook_data, void *call_data) static gboolean after_syscall_exit(void *hook_data, void *call_data) { - update_event_tree((LttvTracefileStats *)call_data); + after_mode_end((LttvTracefileStats *)call_data); return FALSE; } @@ -496,7 +566,7 @@ gboolean before_trap_exit(void *hook_data, void *call_data) gboolean after_trap_exit(void *hook_data, void *call_data) { - update_event_tree((LttvTracefileStats *)call_data); + after_mode_end((LttvTracefileStats *)call_data); return FALSE; } @@ -507,7 +577,6 @@ gboolean before_irq_entry(void *hook_data, void *call_data) return FALSE; } - gboolean after_irq_entry(void *hook_data, void *call_data) { update_event_tree((LttvTracefileStats *)call_data); @@ -523,12 +592,63 @@ gboolean before_irq_exit(void *hook_data, void *call_data) gboolean after_irq_exit(void *hook_data, void *call_data) +{ + after_mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + + +gboolean before_soft_irq_entry(void *hook_data, void *call_data) +{ + mode_change((LttvTracefileStats *)call_data); + return FALSE; +} + +gboolean after_soft_irq_entry(void *hook_data, void *call_data) { update_event_tree((LttvTracefileStats *)call_data); return FALSE; } +gboolean before_soft_irq_exit(void *hook_data, void *call_data) +{ + mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + + +gboolean after_soft_irq_exit(void *hook_data, void *call_data) +{ + after_mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + +gboolean before_function_entry(void *hook_data, void *call_data) +{ + mode_change((LttvTracefileStats *)call_data); + return FALSE; +} + +gboolean after_function_entry(void *hook_data, void *call_data) +{ + update_event_tree((LttvTracefileStats *)call_data); + return FALSE; +} + +gboolean before_function_exit(void *hook_data, void *call_data) +{ + mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + +gboolean after_function_exit(void *hook_data, void *call_data) +{ + after_mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + + gboolean before_schedchange(void *hook_data, void *call_data) { LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; @@ -543,8 +663,6 @@ gboolean before_schedchange(void *hook_data, void *call_data) gint state_out; - LttvProcessState *process; - pid_out = ltt_event_get_unsigned(e, thf->f1); pid_in = ltt_event_get_unsigned(e, thf->f2); state_out = ltt_event_get_int(e, thf->f3); @@ -553,22 +671,44 @@ gboolean before_schedchange(void *hook_data, void *call_data) mode_change(tfcs); - /* get the information for the process scheduled in */ + return FALSE; +} + +gboolean after_schedchange(void *hook_data, void *call_data) +{ + LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; + + LttvTraceState *ts = (LttvTraceState*)tfcs->parent.parent.t_context; + + LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf); + + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data; + + guint pid_in, pid_out; + + gint state_out; + + LttvProcessState *process; + + pid_out = ltt_event_get_unsigned(e, thf->f1); + pid_in = ltt_event_get_unsigned(e, thf->f2); + state_out = ltt_event_get_int(e, thf->f3); - process = lttv_state_find_process_or_create(ts, - ANY_CPU, pid_in, &tfcs->parent.parent.timestamp); + /* get the information for the process scheduled in */ + guint cpu = tfcs->parent.cpu; + process = ts->running_process[cpu]; find_event_tree(tfcs, process->pid_time, - ltt_tracefile_long_name(tfcs->parent.parent.tf), + cpu, + process->current_function, process->state->t, process->state->n, &(tfcs->current_events_tree), &(tfcs->current_event_types_tree)); /* compute the time waiting for the process to schedule in */ - mode_change(tfcs); - return FALSE; -} + return FALSE; +} gboolean process_fork(void *hook_data, void *call_data) { @@ -609,9 +749,54 @@ gboolean every_event(void *hook_data, void *call_data) return FALSE; } +static void lttv_stats_cleanup_process_state(gpointer key, gpointer value, + gpointer user_data) +{ + LttvTraceStats *tcs = (LttvTraceStats *)user_data; + LttvTraceState *ts = (LttvTraceState *)user_data; + LttvTracesetContext *tsc = ts->parent.ts_context; + LttvProcessState *process = (LttvProcessState *)value; + int i; + LttvTracefileStats **tfs = (LttvTracefileStats **) + &g_array_index(ts->parent.tracefiles, LttvTracefileContext*, + process->cpu); + int cleanup_empty = 0; + + do { + if(ltt_time_compare(process->state->cum_cpu_time, ltt_time_zero) != 0) { + find_event_tree(*tfs, process->pid_time, + process->cpu, + process->current_function, + process->state->t, process->state->n, &((*tfs)->current_events_tree), + &((*tfs)->current_event_types_tree)); + /* FIXME : ok, this is a hack. The time is infinite here :( */ + LttTime save_time = (*tfs)->parent.parent.timestamp; + LttTime start, end; + ltt_trace_time_span_get(ts->parent.t, &start, &end); + (*tfs)->parent.parent.timestamp = end; + mode_end(*tfs); + (*tfs)->parent.parent.timestamp = save_time; + } + cleanup_empty = lttv_state_pop_state_cleanup(process, + (LttvTracefileState *)*tfs); + } while(cleanup_empty != 1); +} + +/* For each process in the state, for each of their stacked states, + * perform sum of needed values. */ +static void lttv_stats_cleanup_state(LttvTraceStats *tcs) +{ + LttvTraceState *ts = (LttvTraceState *)tcs; + +#if 0 + /* Does not work correctly FIXME. */ + g_hash_table_foreach(ts->processes, lttv_stats_cleanup_process_state, + tcs); +#endif //0 +} void -lttv_stats_sum_trace(LttvTraceStats *self) +lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats) { LttvAttribute *sum_container = self->stats; @@ -621,86 +806,119 @@ lttv_stats_sum_trace(LttvTraceStats *self) LttvAttributeName name; + gboolean is_named; + unsigned sum; + int trace_is_summed; + int i, j, k, l, m, nb_process, nb_cpu, nb_mode_type, nb_submode, - nb_event_type; + nb_event_type, nf, nb_functions; LttvAttribute *main_tree, *processes_tree, *process_tree, *cpus_tree, *cpu_tree, *mode_tree, *mode_types_tree, *submodes_tree, *submode_tree, *event_types_tree, *mode_events_tree, - *cpu_events_tree, *process_modes_tree, *trace_cpu_tree, - *trace_modes_tree; + *cpu_functions_tree, + *function_tree, + *function_mode_types_tree, + *trace_cpu_tree; + main_tree = sum_container; lttv_attribute_find(sum_container, LTTV_STATS_SUMMED, LTTV_UINT, &value); - if(*(value.v_uint) != 0) return; + trace_is_summed = *(value.v_uint); *(value.v_uint) = 1; + /* First cleanup the state : sum all stalled information (never ending + * states). */ + if(!trace_is_summed) + lttv_stats_cleanup_state(self); + processes_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_PROCESSES); - trace_modes_tree = lttv_attribute_find_subdir(main_tree, - LTTV_STATS_MODES); nb_process = lttv_attribute_get_number(processes_tree); for(i = 0 ; i < nb_process ; i++) { - type = lttv_attribute_get(processes_tree, i, &name, &value); + type = lttv_attribute_get(processes_tree, i, &name, &value, &is_named); process_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); cpus_tree = lttv_attribute_find_subdir(process_tree, LTTV_STATS_CPU); - process_modes_tree = lttv_attribute_find_subdir(process_tree, - LTTV_STATS_MODES); nb_cpu = lttv_attribute_get_number(cpus_tree); for(j = 0 ; j < nb_cpu ; j++) { - type = lttv_attribute_get(cpus_tree, j, &name, &value); + type = lttv_attribute_get(cpus_tree, j, &name, &value, &is_named); cpu_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); - mode_types_tree = lttv_attribute_find_subdir(cpu_tree, - LTTV_STATS_MODE_TYPES); - cpu_events_tree = lttv_attribute_find_subdir(cpu_tree, - LTTV_STATS_EVENTS); trace_cpu_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_CPU); - trace_cpu_tree = lttv_attribute_find_subdir(trace_cpu_tree, name); - nb_mode_type = lttv_attribute_get_number(mode_types_tree); - - for(k = 0 ; k < nb_mode_type ; k++) { - type = lttv_attribute_get(mode_types_tree, k, &name, &value); - mode_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); - - submodes_tree = lttv_attribute_find_subdir(mode_tree, - LTTV_STATS_SUBMODES); - mode_events_tree = lttv_attribute_find_subdir(mode_tree, - LTTV_STATS_EVENTS); - nb_submode = lttv_attribute_get_number(submodes_tree); - - for(l = 0 ; l < nb_submode ; l++) { - type = lttv_attribute_get(submodes_tree, l, &name, &value); - submode_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); - - event_types_tree = lttv_attribute_find_subdir(submode_tree, - LTTV_STATS_EVENT_TYPES); - nb_event_type = lttv_attribute_get_number(event_types_tree); - - sum = 0; - for(m = 0 ; m < nb_event_type ; m++) { - type = lttv_attribute_get(event_types_tree, m, &name, &value); - sum += *(value.v_uint); - } - lttv_attribute_find(submode_tree, LTTV_STATS_EVENTS_COUNT, - LTTV_UINT, &value); - *(value.v_uint) = sum; - lttv_attribute_recursive_add(mode_events_tree, submode_tree); - } - lttv_attribute_recursive_add(cpu_events_tree, mode_events_tree); - } - lttv_attribute_recursive_add(process_modes_tree, cpu_tree); - lttv_attribute_recursive_add(trace_cpu_tree, cpu_tree); + trace_cpu_tree = lttv_attribute_find_subdir_unnamed(trace_cpu_tree, name); + cpu_functions_tree = lttv_attribute_find_subdir(cpu_tree, + LTTV_STATS_FUNCTIONS); + nb_functions = lttv_attribute_get_number(cpu_functions_tree); + + for(nf=0; nf < nb_functions; nf++) { + type = lttv_attribute_get(cpu_functions_tree, nf, &name, &value, + &is_named); + function_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); + function_mode_types_tree = lttv_attribute_find_subdir(function_tree, + LTTV_STATS_MODE_TYPES); + nb_mode_type = lttv_attribute_get_number(function_mode_types_tree); + for(k = 0 ; k < nb_mode_type ; k++) { + type = lttv_attribute_get(function_mode_types_tree, k, &name, &value, + &is_named); + mode_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); + + submodes_tree = lttv_attribute_find_subdir(mode_tree, + LTTV_STATS_SUBMODES); + mode_events_tree = lttv_attribute_find_subdir(mode_tree, + LTTV_STATS_EVENTS); + mode_types_tree = lttv_attribute_find_subdir(mode_tree, + LTTV_STATS_MODE_TYPES); + + nb_submode = lttv_attribute_get_number(submodes_tree); + + for(l = 0 ; l < nb_submode ; l++) { + type = lttv_attribute_get(submodes_tree, l, &name, &value, + &is_named); + submode_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); + + event_types_tree = lttv_attribute_find_subdir(submode_tree, + LTTV_STATS_EVENT_TYPES); + nb_event_type = lttv_attribute_get_number(event_types_tree); + + sum = 0; + for(m = 0 ; m < nb_event_type ; m++) { + type = lttv_attribute_get(event_types_tree, m, &name, &value, + &is_named); + sum += *(value.v_uint); + } + lttv_attribute_find(submode_tree, LTTV_STATS_EVENTS_COUNT, + LTTV_UINT, &value); + *(value.v_uint) = sum; + + type = lttv_attribute_get(submodes_tree, l, &name, &value, + &is_named); + submode_tree = LTTV_ATTRIBUTE(*(value.v_gobject)); + if(!trace_is_summed) { + lttv_attribute_recursive_add(mode_events_tree, event_types_tree); + lttv_attribute_recursive_add(mode_types_tree, submode_tree); + } + } + if(!trace_is_summed) { + //lttv_attribute_recursive_add(function_tree, mode_types_tree); + } + } + if(!trace_is_summed) { + //lttv_attribute_recursive_add(cpu_tree, function_tree); + //lttv_attribute_recursive_add(process_tree, function_tree); + //lttv_attribute_recursive_add(trace_cpu_tree, function_tree); + //lttv_attribute_recursive_add(main_tree, function_tree); + } + //lttv_attribute_recursive_add(ts_stats, function_tree); + } } - lttv_attribute_recursive_add(trace_modes_tree, process_modes_tree); } } @@ -721,7 +939,7 @@ lttv_stats_sum_traceset(LttvTracesetStats *self) int i, nb_trace; - LttvAttribute *main_tree, *trace_modes_tree, *traceset_modes_tree; + LttvAttribute *main_tree; LttvAttributeValue value; @@ -730,16 +948,12 @@ lttv_stats_sum_traceset(LttvTracesetStats *self) if(*(value.v_uint) != 0) return; *(value.v_uint) = 1; - traceset_modes_tree = lttv_attribute_find_subdir(sum_container, - LTTV_STATS_MODES); nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { tcs = (LttvTraceStats *)(self->parent.parent.traces[i]); - lttv_stats_sum_trace(tcs); - main_tree = tcs->stats; - trace_modes_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_MODES); - lttv_attribute_recursive_add(traceset_modes_tree, trace_modes_tree); + lttv_stats_sum_trace(tcs, self->stats); + // lttv_attribute_recursive_add(sum_container, tcs->stats); } } @@ -773,6 +987,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) LttvAttributeValue val; gint ret; + gint hn; nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { @@ -781,127 +996,194 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *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), 7); - g_array_set_size(hooks, 7); + hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 11); + g_array_set_size(hooks, 11); + hn=0; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY, LTT_FIELD_SYSCALL_ID, 0, 0, before_syscall_entry, NULL, - &g_array_index(hooks, LttvTraceHook, 0)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT, 0, 0, 0, before_syscall_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 1)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, LTT_FIELD_TRAP_ID, 0, 0, before_trap_entry, NULL, - &g_array_index(hooks, LttvTraceHook, 2)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, 0, 0, 0, before_trap_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 3)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY, LTT_FIELD_IRQ_ID, 0, 0, before_irq_entry, NULL, - &g_array_index(hooks, LttvTraceHook, 4)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT, 0, 0, 0, before_irq_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 5)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY, + LTT_FIELD_SOFT_IRQ_ID, 0, 0, + before_soft_irq_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT, + 0, 0, 0, + before_soft_irq_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, before_schedchange, NULL, - &g_array_index(hooks, LttvTraceHook, 6)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_ENTRY, + LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0, + before_function_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_EXIT, + LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0, + before_function_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + g_array_set_size(hooks, hn); before_hooks = hooks; - hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 9); - g_array_set_size(hooks, 9); + hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 14); + g_array_set_size(hooks, 14); + hn=0; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY, LTT_FIELD_SYSCALL_ID, 0, 0, after_syscall_entry, NULL, - &g_array_index(hooks, LttvTraceHook, 0)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT, 0, 0, 0, after_syscall_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 1)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, LTT_FIELD_TRAP_ID, 0, 0, after_trap_entry, NULL, - &g_array_index(hooks, LttvTraceHook, 2)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, 0, 0, 0, after_trap_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 3)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY, LTT_FIELD_IRQ_ID, 0, 0, after_irq_entry, NULL, - &g_array_index(hooks, LttvTraceHook, 4)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT, 0, 0, 0, after_irq_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 5)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY, + LTT_FIELD_SOFT_IRQ_ID, 0, 0, + after_irq_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT, + 0, 0, 0, + after_soft_irq_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, + after_schedchange, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_PROCESS, LTT_EVENT_FORK, LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0, process_fork, NULL, - &g_array_index(hooks, LttvTraceHook, 6)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, LTT_FIELD_PID, 0, 0, process_exit, NULL, - &g_array_index(hooks, LttvTraceHook, 7)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_PROCESS, LTT_EVENT_FREE, LTT_FIELD_PID, 0, 0, process_free, NULL, - &g_array_index(hooks, LttvTraceHook, 8)); - g_assert(!ret); + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_ENTRY, + LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0, + after_function_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_EXIT, + LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0, + after_function_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + g_array_set_size(hooks, hn); after_hooks = hooks; @@ -1033,9 +1315,11 @@ static void module_init() LTTV_STATS_MODE_TYPES = g_quark_from_string("mode_types"); LTTV_STATS_MODES = g_quark_from_string("modes"); LTTV_STATS_SUBMODES = g_quark_from_string("submodes"); + LTTV_STATS_FUNCTIONS = g_quark_from_string("functions"); LTTV_STATS_EVENT_TYPES = g_quark_from_string("event_types"); LTTV_STATS_CPU_TIME = g_quark_from_string("cpu time"); - LTTV_STATS_ELAPSED_TIME = g_quark_from_string("elapsed time"); + LTTV_STATS_CUMULATIVE_CPU_TIME = g_quark_from_string("cumulative cpu time (includes nested routines and modes)"); + LTTV_STATS_ELAPSED_TIME = g_quark_from_string("elapsed time (includes per process waiting time)"); LTTV_STATS_EVENTS = g_quark_from_string("events"); LTTV_STATS_EVENTS_COUNT = g_quark_from_string("events count"); LTTV_STATS_BEFORE_HOOKS = g_quark_from_string("saved stats before hooks");