X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=f3743dc90c34288ae82bd9eb82792461d161e2b7;hb=b91e751bfd4702dd0e73008727b38d9043f609c5;hp=a59736c12f3ee62ff693d9e4d0197e7af22eb6dd;hpb=c0cb4d12b6441b5964a5017e8c58349bec15e7b8;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index a59736c1..f3743dc9 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -40,9 +40,10 @@ GQuark LTTV_STATS_MODE_TYPES, LTTV_STATS_MODES, LTTV_STATS_SUBMODES, - LTTV_STATS_FUNCTIONS, + 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, @@ -55,7 +56,7 @@ GQuark static void find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, guint cpu, - guint64 function, + guint64 function, GQuark mode, GQuark sub_mode, LttvAttribute **events_tree, LttvAttribute **event_types_tree); @@ -120,10 +121,10 @@ static void lttv_stats_init(LttvTracesetStats *self) 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; + guint cpu = tfcs->parent.cpu; find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN, - cpu, - 0x0ULL, + cpu, + 0x0ULL, LTTV_STATE_MODE_UNKNOWN, LTTV_STATE_SUBMODE_UNKNOWN, &tfcs->current_events_tree, &tfcs->current_event_types_tree); @@ -392,23 +393,24 @@ lttv_tracefile_stats_get_type(void) return type; } - static void find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, guint cpu, - guint64 function, + guint64 function, GQuark mode, GQuark sub_mode, LttvAttribute **events_tree, LttvAttribute **event_types_tree) { LttvAttribute *a, *prev_a; - gchar fstring[MAX_64_HEX_STRING_LEN]; + gchar fstring[MAX_64_HEX_STRING_LEN]; + gint ret; - g_assert(snprintf(fstring, MAX_64_HEX_STRING_LEN-1, - "0x%llX", function) > 0); - fstring[MAX_64_HEX_STRING_LEN-1] = '\0'; + 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); @@ -426,62 +428,127 @@ find_event_tree(LttvTracefileStats *tfcs, *event_types_tree = a; } - -static void update_event_tree(LttvTracefileStats *tfcs) +static void update_event_tree(LttvTracefileStats *tfcs) { - LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; guint cpu = tfcs->parent.cpu; + LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; LttvProcessState *process = ts->running_process[cpu]; LttvExecutionState *es = process->state; find_event_tree(tfcs, process->pid_time, cpu, - process->current_function, + process->current_function, es->t, es->n, &(tfcs->current_events_tree), &(tfcs->current_event_types_tree)); } +/* Update the trace event tree for the specified cpu */ +static void update_trace_event_tree(LttvTraceStats *tcs) +{ + LttvTracefileStats *tfcs; + LttvTraceContext *tc = (LttvTraceContext*)tcs; + guint j, nb_tracefile; + + /* For each tracefile, update the event tree */ + nb_tracefile = tc->tracefiles->len; + for(j = 0; j < nb_tracefile; j++) { + tfcs = LTTV_TRACEFILE_STATS(g_array_index(tc->tracefiles, + LttvTracefileContext*, j)); + update_event_tree(tfcs); + } +} + static void mode_change(LttvTracefileStats *tfcs) { LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; guint cpu = tfcs->parent.cpu; LttvProcessState *process = ts->running_process[cpu]; - LttvAttributeValue cpu_time; + LttvAttributeValue cpu_time, cum_cpu_time; LttTime delta; + if(process->state->s == LTTV_STATE_RUN && + process->state->t != LTTV_STATE_MODE_UNKNOWN) + delta = ltt_time_sub(tfcs->parent.parent.timestamp, + process->state->change); + else + delta = ltt_time_zero; + 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); *(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 = tfcs->parent.cpu; LttvProcessState *process = ts->running_process[cpu]; - LttvAttributeValue elapsed_time, cpu_time; + LttvAttributeValue elapsed_time, cpu_time, cum_cpu_time; LttTime delta; + /* FIXME put there in case of a missing update after a state modification */ + //void *lasttree = tfcs->current_events_tree; + //update_event_tree(tfcs); + //g_assert (lasttree == tfcs->current_events_tree); lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_ELAPSED_TIME, LTTV_TIME, &elapsed_time); - delta = ltt_time_sub(tfcs->parent.parent.timestamp, - process->state->entry); + + if(process->state->t != LTTV_STATE_MODE_UNKNOWN) { + delta = ltt_time_sub(tfcs->parent.parent.timestamp, + process->state->entry); + } else + delta = ltt_time_zero; + *(elapsed_time.v_time) = ltt_time_add(*(elapsed_time.v_time), 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); + + /* if it is a running mode, we must count its cpu time */ + if(process->state->s == LTTV_STATE_RUN && + process->state->t != LTTV_STATE_MODE_UNKNOWN) + delta = ltt_time_sub(tfcs->parent.parent.timestamp, + process->state->change); + else + delta = ltt_time_zero; + *(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); @@ -496,7 +563,7 @@ static gboolean after_syscall_entry(void *hook_data, void *call_data) } -gboolean before_syscall_exit(void *hook_data, void *call_data) +static gboolean before_syscall_exit(void *hook_data, void *call_data) { mode_end((LttvTracefileStats *)call_data); return FALSE; @@ -505,12 +572,12 @@ 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; } -gboolean before_trap_entry(void *hook_data, void *call_data) +static gboolean before_trap_entry(void *hook_data, void *call_data) { mode_change((LttvTracefileStats *)call_data); return FALSE; @@ -524,99 +591,98 @@ static gboolean after_trap_entry(void *hook_data, void *call_data) } -gboolean before_trap_exit(void *hook_data, void *call_data) +static gboolean before_trap_exit(void *hook_data, void *call_data) { mode_end((LttvTracefileStats *)call_data); return FALSE; } -gboolean after_trap_exit(void *hook_data, void *call_data) +static gboolean after_trap_exit(void *hook_data, void *call_data) { - update_event_tree((LttvTracefileStats *)call_data); + after_mode_end((LttvTracefileStats *)call_data); return FALSE; } -gboolean before_irq_entry(void *hook_data, void *call_data) +static gboolean before_irq_entry(void *hook_data, void *call_data) { mode_change((LttvTracefileStats *)call_data); return FALSE; } -gboolean after_irq_entry(void *hook_data, void *call_data) +static gboolean after_irq_entry(void *hook_data, void *call_data) { update_event_tree((LttvTracefileStats *)call_data); return FALSE; } -gboolean before_irq_exit(void *hook_data, void *call_data) +static gboolean before_irq_exit(void *hook_data, void *call_data) { mode_end((LttvTracefileStats *)call_data); return FALSE; } -gboolean after_irq_exit(void *hook_data, void *call_data) +static gboolean after_irq_exit(void *hook_data, void *call_data) { - update_event_tree((LttvTracefileStats *)call_data); + after_mode_end((LttvTracefileStats *)call_data); return FALSE; } -gboolean before_soft_irq_entry(void *hook_data, void *call_data) +static 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) +static 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) +static 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) +static gboolean after_soft_irq_exit(void *hook_data, void *call_data) { - update_event_tree((LttvTracefileStats *)call_data); + after_mode_end((LttvTracefileStats *)call_data); return FALSE; } -gboolean before_function_entry(void *hook_data, void *call_data) +static gboolean before_function_entry(void *hook_data, void *call_data) { - mode_end((LttvTracefileStats *)call_data); + mode_change((LttvTracefileStats *)call_data); return FALSE; } -gboolean after_function_entry(void *hook_data, void *call_data) +static 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) +static 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) +static gboolean after_function_exit(void *hook_data, void *call_data) { - update_event_tree((LttvTracefileStats *)call_data); + after_mode_end((LttvTracefileStats *)call_data); return FALSE; } -gboolean before_schedchange(void *hook_data, void *call_data) +static gboolean before_schedchange(void *hook_data, void *call_data) { LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; @@ -630,56 +696,97 @@ 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); /* compute the time for the process to schedule out */ - mode_change(tfcs); - /* get the information for the process scheduled in */ + return FALSE; +} - process = lttv_state_find_process_or_create(ts, - ANY_CPU, pid_in, &tfcs->parent.parent.timestamp); +static 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); + /* 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, cpu, - process->current_function, + 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; } +static gboolean process_fork(void *hook_data, void *call_data) +{ + return FALSE; +} -gboolean process_fork(void *hook_data, void *call_data) +static gboolean process_exit(void *hook_data, void *call_data) { - /* nothing to do for now */ + update_event_tree((LttvTracefileStats *)call_data); return FALSE; } +static gboolean before_enum_process_state(void *hook_data, void *call_data) +{ +#if 0 + /* Broken : adds up time in the current process doing the dump */ + LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; + mode_end(tfcs); + after_mode_end(tfcs); + mode_change(tfcs); +#endif //0 + return FALSE; +} -gboolean process_exit(void *hook_data, void *call_data) +static gboolean after_enum_process_state(void *hook_data, void *call_data) { - /* We should probably exit all modes here or we could do that at - schedule out. */ + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context; + update_trace_event_tree(tcs); return FALSE; } -gboolean process_free(void *hook_data, void *call_data) +static gboolean after_statedump_end(void *hook_data, void *call_data) { + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context; + update_trace_event_tree(tcs); return FALSE; } -gboolean every_event(void *hook_data, void *call_data) +static gboolean process_free(void *hook_data, void *call_data) +{ + return FALSE; +} + +static gboolean every_event(void *hook_data, void *call_data) { LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; @@ -699,9 +806,82 @@ gboolean every_event(void *hook_data, void *call_data) return FALSE; } +struct cleanup_state_struct { + LttvTraceState *ts; + LttTime current_time; +}; + +//static void lttv_stats_cleanup_process_state(LttvTraceState *ts, +// LttvProcessState *process, LttTime current_time) +static void lttv_stats_cleanup_process_state(gpointer key, gpointer value, + gpointer user_data) +{ + struct cleanup_state_struct *cleanup_closure = + (struct cleanup_state_struct *)user_data; + LttvTraceState *ts = cleanup_closure->ts; + LttvTraceStats *tcs = (LttvTraceStats *)ts; + LttvProcessState *process = (LttvProcessState *)value; + LttvTracesetContext *tsc = ts->parent.ts_context; + LttTime current_time = cleanup_closure->current_time; + int i; + LttvTracefileStats **tfs = (LttvTracefileStats **) + &g_array_index(ts->parent.tracefiles, LttvTracefileContext*, + process->cpu); + int cleanup_empty = 0; + LttTime nested_delta = ltt_time_zero; + + /* 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; + + 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)); + /* Call mode_end only if not at end of trace */ + if(ltt_time_compare(current_time, ltt_time_infinite) != 0) + mode_end(*tfs); + nested_delta = process->state->cum_cpu_time; + } + cleanup_empty = lttv_state_pop_state_cleanup(process, + (LttvTracefileState *)*tfs); + process->state->cum_cpu_time = ltt_time_add(process->state->cum_cpu_time, + nested_delta); + + } while(cleanup_empty != 1); + + //(*tfs)->parent.parent.timestamp = save_time; +} + +/* For each cpu, for each of their stacked states, + * perform sum of needed values. */ +static void lttv_stats_cleanup_state(LttvTraceStats *tcs, LttTime current_time) +{ + LttvTraceState *ts = (LttvTraceState *)tcs; + struct cleanup_state_struct cleanup_closure; +#if 0 + guint nb_cpus, i; + + nb_cpus = ltt_trace_get_num_cpu(ts->parent.t); + + for(i=0; irunning_process[i], current_time); + } +#endif //0 + cleanup_closure.ts = tcs; + cleanup_closure.current_time = current_time; + g_hash_table_foreach(ts->processes, lttv_stats_cleanup_process_state, + &cleanup_closure); +} void -lttv_stats_sum_trace(LttvTraceStats *self) +lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats, + LttTime current_time) { LttvAttribute *sum_container = self->stats; @@ -711,10 +891,12 @@ lttv_stats_sum_trace(LttvTraceStats *self) LttvAttributeName name; - gboolean is_named; + 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, nf, nb_functions; @@ -722,18 +904,24 @@ lttv_stats_sum_trace(LttvTraceStats *self) *cpu_tree, *mode_tree, *mode_types_tree, *submodes_tree, *submode_tree, *event_types_tree, *mode_events_tree, *cpu_functions_tree, - *function_tree, - *function_mode_types_tree, - *trace_cpu_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, current_time); + processes_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_PROCESSES); nb_process = lttv_attribute_get_number(processes_tree); @@ -751,63 +939,70 @@ lttv_stats_sum_trace(LttvTraceStats *self) trace_cpu_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_CPU); 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)); - lttv_attribute_recursive_add(mode_events_tree, event_types_tree); - lttv_attribute_recursive_add(mode_types_tree, submode_tree); - } - } - lttv_attribute_recursive_add(main_tree, mode_types_tree); - lttv_attribute_recursive_add(trace_cpu_tree, mode_types_tree); - lttv_attribute_recursive_add(process_tree, mode_types_tree); - lttv_attribute_recursive_add(function_tree, mode_types_tree); - } - lttv_attribute_recursive_add(process_tree, cpu_tree); + 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); + } } } } @@ -815,12 +1010,14 @@ lttv_stats_sum_trace(LttvTraceStats *self) gboolean lttv_stats_sum_traceset_hook(void *hook_data, void *call_data) { - lttv_stats_sum_traceset((LttvTracesetStats *)call_data); + struct sum_traceset_closure *closure = + (struct sum_traceset_closure *)call_data; + lttv_stats_sum_traceset(closure->tss, closure->current_time); return 0; } void -lttv_stats_sum_traceset(LttvTracesetStats *self) +lttv_stats_sum_traceset(LttvTracesetStats *self, LttTime current_time) { LttvTraceset *traceset = self->parent.parent.ts; LttvAttribute *sum_container = self->stats; @@ -842,9 +1039,8 @@ lttv_stats_sum_traceset(LttvTracesetStats *self) for(i = 0 ; i < nb_trace ; i++) { tcs = (LttvTraceStats *)(self->parent.parent.traces[i]); - lttv_stats_sum_trace(tcs); - main_tree = tcs->stats; - lttv_attribute_recursive_add(sum_container, main_tree); + lttv_stats_sum_trace(tcs, self->stats, current_time); + // lttv_attribute_recursive_add(sum_container, tcs->stats); } } @@ -878,7 +1074,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) LttvAttributeValue val; gint ret; - gint hn; + gint hn; nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { @@ -887,9 +1083,9 @@ 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), 11); - g_array_set_size(hooks, 11); - hn=0; + hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 12); + g_array_set_size(hooks, 12); + hn=0; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY, @@ -967,14 +1163,22 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) before_function_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; - + + /* statedump-related hooks */ + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME, + before_enum_process_state, 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), 13); - g_array_set_size(hooks, 13); - hn=0; + hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 16); + g_array_set_size(hooks, 16); + hn=0; ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY, @@ -1032,6 +1236,13 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) &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, @@ -1066,7 +1277,22 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) after_function_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); if(ret) hn--; - + + /* statedump-related hooks */ + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME, + after_enum_process_state, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END, + 0, 0, 0, + after_statedump_end, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + g_array_set_size(hooks, hn); after_hooks = hooks; @@ -1202,7 +1428,8 @@ static void module_init() 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");