X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=a5a30036cd7f14bae05b28144ded9ca55c67beab;hb=370231d773499c6dc367b96172557715427cb6d4;hp=4f476d93d9d1ee74c33467a4ed55fb1f78b4b71e;hpb=4e4d11b3b1db254446f6cad04b3c3fa9b574851f;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index 4f476d93..a5a30036 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -25,11 +25,11 @@ #include #include #include -#include #include #include #define BUF_SIZE 256 +#define MAX_64_HEX_STRING_LEN 19 GQuark LTTV_STATS_PROCESS_UNKNOWN, @@ -38,27 +38,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; @@ -66,20 +67,14 @@ init(LttvTracesetStats *self, LttvTraceset *ts) LttvTraceStats *tcs; - LttvTracefileContext *tfc; - + LttvTracefileContext **tfs; LttvTracefileStats *tfcs; - LttTime timestamp = {0,0}; - LttvAttributeValue v; - LttvAttribute - *stats_tree, - *tracefiles_stats; + LttvAttribute *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), @@ -88,7 +83,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); } @@ -96,8 +91,8 @@ init(LttvTracesetStats *self, LttvTraceset *ts) nb_trace = lttv_traceset_number(ts); for(i = 0 ; i < nb_trace ; i++) { - tc = (LTTV_TRACESET_CONTEXT(self)->traces[i]); - tcs = (LttvTraceStats *)tc; + tc = self->parent.parent.traces[i]; + tcs = LTTV_TRACE_STATS(tc); tcs->stats = lttv_attribute_find_subdir(tcs->parent.parent.t_a,LTTV_STATS); tracefiles_stats = lttv_attribute_find_subdir(tcs->parent.parent.t_a, @@ -105,28 +100,32 @@ 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); } - nb_tracefile = ltt_trace_control_tracefile_number(tc->t) + - ltt_trace_per_cpu_tracefile_number(tc->t); + nb_tracefile = tc->tracefiles->len; for(j = 0 ; j < nb_tracefile ; j++) { - tfcs = LTTV_TRACEFILE_STATS(tc->tracefiles[j]); + tfs = &g_array_index(tc->tracefiles, + LttvTracefileContext*, j); + tfcs = LTTV_TRACEFILE_STATS(*tfs); tfcs->stats = lttv_attribute_find_subdir(tracefiles_stats, - tfcs->parent.cpu_name); + ltt_tracefile_long_name(tfcs->parent.parent.tf)); + guint cpu = tfcs->parent.cpu; find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN, - tfcs->parent.cpu_name, LTTV_STATE_MODE_UNKNOWN, + 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; @@ -140,15 +139,13 @@ fini(LttvTracesetStats *self) LttvTracefileStats *tfcs; - LttTime timestamp = {0,0}; - LttvAttributeValue v; LttvAttribute *tracefiles_stats; 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); @@ -163,7 +160,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); @@ -174,17 +171,43 @@ fini(LttvTracesetStats *self) } tcs->stats = NULL; - nb_tracefile = ltt_trace_control_tracefile_number(tc->t) + - ltt_trace_per_cpu_tracefile_number(tc->t); + nb_tracefile = tc->tracefiles->len; for(j = 0 ; j < nb_tracefile ; j++) { - tfc = tc->tracefiles[j]; + tfc = g_array_index(tc->tracefiles, + LttvTracefileContext*, j); tfcs = (LttvTracefileStats *)tfc; tfcs->stats = NULL; tfcs->current_events_tree = NULL; 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); } @@ -360,23 +383,32 @@ lttv_tracefile_stats_get_type(void) return type; } - 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; + gchar fstring[MAX_64_HEX_STRING_LEN]; + gint ret; - LttvTraceStats *tcs = LTTV_TRACE_STATS(tfcs->parent.parent.t_context); + 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); @@ -386,52 +418,126 @@ find_event_tree(LttvTracefileStats *tfcs, *event_types_tree = a; } - -static void update_event_tree(LttvTracefileStats *tfcs) +static void update_event_tree(LttvTracefileStats *tfcs) { - LttvExecutionState *es = tfcs->parent.process->state; - - find_event_tree(tfcs, tfcs->parent.process->pid_time, - tfcs->parent.cpu_name, + 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, 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) { - LttvAttributeValue cpu_time; + LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; + guint cpu = tfcs->parent.cpu; + LttvProcessState *process = ts->running_process[cpu]; + LttvAttributeValue 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, - tfcs->parent.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) { - LttvAttributeValue elapsed_time, cpu_time; + LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; + guint cpu = tfcs->parent.cpu; + LttvProcessState *process = ts->running_process[cpu]; + 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, - tfcs->parent.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, - tfcs->parent.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]; + + 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); @@ -446,7 +552,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; @@ -455,12 +561,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; @@ -474,100 +580,205 @@ 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) +{ + after_mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + + +static gboolean before_soft_irq_entry(void *hook_data, void *call_data) +{ + mode_change((LttvTracefileStats *)call_data); + return FALSE; +} + +static gboolean after_soft_irq_entry(void *hook_data, void *call_data) { update_event_tree((LttvTracefileStats *)call_data); return FALSE; } +static gboolean before_soft_irq_exit(void *hook_data, void *call_data) +{ + mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + -gboolean before_schedchange(void *hook_data, void *call_data) +static gboolean after_soft_irq_exit(void *hook_data, void *call_data) { - LttvTraceHook *h = (LttvTraceHook *)hook_data; + after_mode_end((LttvTracefileStats *)call_data); + return FALSE; +} +static gboolean before_function_entry(void *hook_data, void *call_data) +{ + mode_change((LttvTracefileStats *)call_data); + return FALSE; +} + +static gboolean after_function_entry(void *hook_data, void *call_data) +{ + update_event_tree((LttvTracefileStats *)call_data); + return FALSE; +} + +static gboolean before_function_exit(void *hook_data, void *call_data) +{ + mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + +static gboolean after_function_exit(void *hook_data, void *call_data) +{ + after_mode_end((LttvTracefileStats *)call_data); + return FALSE; +} + + +static gboolean before_schedchange(void *hook_data, void *call_data) +{ LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; - guint pid_in, pid_out, state_out; + LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf); - LttvProcessState *process; + LttvTraceHook *th = (LttvTraceHook *)hook_data; - pid_in = ltt_event_get_unsigned(tfcs->parent.parent.e, h->f1); - pid_out = ltt_event_get_unsigned(tfcs->parent.parent.e, h->f2); - state_out = ltt_event_get_unsigned(tfcs->parent.parent.e, h->f3); + guint pid_in, pid_out; + + gint64 state_out; - /* compute the time for the process to schedule out */ + pid_out = ltt_event_get_unsigned(e, th->f1); + pid_in = ltt_event_get_unsigned(e, th->f2); + state_out = ltt_event_get_long_int(e, th->f3); + /* compute the time for the process to schedule out */ mode_change(tfcs); - /* get the information for the process scheduled in */ + return FALSE; +} + +static gboolean after_schedchange(void *hook_data, void *call_data) +{ + LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; + + LttvTraceState *ts = (LttvTraceState*)tfcs->parent.parent.t_context; - process = lttv_state_find_process_or_create(&(tfcs->parent), pid_in); + LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf); - find_event_tree(tfcs, process->pid_time, tfcs->parent.cpu_name, + LttvTraceHook *th = (LttvTraceHook *)hook_data; + + guint pid_in, pid_out; + + gint64 state_out; + + LttvProcessState *process; + + pid_out = ltt_event_get_unsigned(e, th->f1); + pid_in = ltt_event_get_unsigned(e, th->f2); + state_out = ltt_event_get_long_int(e, th->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->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; } +static gboolean process_exit(void *hook_data, void *call_data) +{ + update_event_tree((LttvTracefileStats *)call_data); + return FALSE; +} -gboolean process_fork(void *hook_data, void *call_data) +static gboolean before_enum_process_state(void *hook_data, void *call_data) { - /* nothing to do for now */ +#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; } +static gboolean after_enum_process_state(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 process_exit(void *hook_data, void *call_data) +static gboolean after_statedump_end(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; } +static gboolean process_free(void *hook_data, void *call_data) +{ + return FALSE; +} -gboolean every_event(void *hook_data, void *call_data) +static gboolean every_event(void *hook_data, void *call_data) { LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data; + LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf); + LttvAttributeValue v; /* The current branch corresponds to the tracefile/process/interrupt state. @@ -576,16 +787,85 @@ gboolean every_event(void *hook_data, void *call_data) event type and is used as name. */ lttv_attribute_find(tfcs->current_event_types_tree, - ((LttvTraceState *)(tfcs->parent.parent.t_context))-> - eventtype_names[ltt_event_eventtype_id(tfcs->parent.parent.e)], + ltt_eventtype_name(ltt_event_eventtype(e)), LTTV_UINT, &v); (*(v.v_uint))++; 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; + LttvProcessState *process = (LttvProcessState *)value; + LttTime current_time = cleanup_closure->current_time; + 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; @@ -595,98 +875,133 @@ 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, current_time); + 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); + 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); } - 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); + 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(process_modes_tree, cpu_tree); - lttv_attribute_recursive_add(trace_cpu_tree, cpu_tree); } - lttv_attribute_recursive_add(trace_modes_tree, process_modes_tree); } } 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; @@ -695,8 +1010,6 @@ lttv_stats_sum_traceset(LttvTracesetStats *self) int i, nb_trace; - LttvAttribute *main_tree, *trace_modes_tree, *traceset_modes_tree; - LttvAttributeValue value; lttv_attribute_find(sum_container, LTTV_STATS_SUMMED, @@ -704,16 +1017,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, current_time); + // lttv_attribute_recursive_add(sum_container, tcs->stats); } } @@ -734,22 +1043,19 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) guint i, j, k, nb_trace, nb_tracefile; - LttFacility *f; - - LttEventType *et; - LttvTraceStats *ts; LttvTracefileStats *tfs; - void *hook_data; - GArray *hooks, *before_hooks, *after_hooks; - LttvTraceHook hook; + LttvTraceHook *th; LttvAttributeValue val; + gint ret; + gint hn; + nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { ts = (LttvTraceStats *)self->parent.parent.traces[i]; @@ -757,90 +1063,244 @@ 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_new(FALSE, FALSE, sizeof(LttvTraceHook)); - g_array_set_size(hooks, 7); - - lttv_trace_find_hook(ts->parent.parent.t, "core","syscall_entry", - "syscall_id", NULL, NULL, before_syscall_entry, - &g_array_index(hooks, LttvTraceHook, 0)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "syscall_exit", NULL, - NULL, NULL, before_syscall_exit, - &g_array_index(hooks, LttvTraceHook, 1)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "trap_entry", "trap_id", - NULL, NULL, before_trap_entry, - &g_array_index(hooks, LttvTraceHook, 2)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "trap_exit", NULL, NULL, - NULL, before_trap_exit, &g_array_index(hooks, LttvTraceHook, 3)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "irq_entry", "irq_id", - NULL, NULL, before_irq_entry, &g_array_index(hooks, LttvTraceHook, 4)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "irq_exit", NULL, NULL, - NULL, before_irq_exit, &g_array_index(hooks, LttvTraceHook, 5)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "schedchange", "in", - "out", "out_state", before_schedchange, - &g_array_index(hooks, LttvTraceHook, 6)); + 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_EVENT_SYSCALL_ENTRY, + LTT_FIELD_SYSCALL_ID, 0, 0, + before_syscall_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_SYSCALL_EXIT, + 0, 0, 0, + before_syscall_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_TRAP_ENTRY, + LTT_FIELD_TRAP_ID, 0, 0, + before_trap_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_TRAP_EXIT, + 0, 0, 0, + before_trap_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_IRQ_ENTRY, + LTT_FIELD_IRQ_ID, 0, 0, + before_irq_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_IRQ_EXIT, + 0, 0, 0, + before_irq_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + 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_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_EVENT_SCHED_SCHEDULE, + LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE, + before_schedchange, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + 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_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--; + + /* statedump-related hooks */ + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_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_new(FALSE, FALSE, sizeof(LttvTraceHook)); - g_array_set_size(hooks, 8); - - lttv_trace_find_hook(ts->parent.parent.t, "core","syscall_entry", - "syscall_id", NULL, NULL, after_syscall_entry, - &g_array_index(hooks, LttvTraceHook, 0)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "syscall_exit", NULL, - NULL, NULL, after_syscall_exit, - &g_array_index(hooks, LttvTraceHook, 1)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "trap_entry", "trap_id", - NULL, NULL, after_trap_entry, &g_array_index(hooks, LttvTraceHook, 2)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "trap_exit", NULL, NULL, - NULL, after_trap_exit, &g_array_index(hooks, LttvTraceHook, 3)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "irq_entry", "irq_id", - NULL, NULL, after_irq_entry, &g_array_index(hooks, LttvTraceHook, 4)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "irq_exit", NULL, NULL, - NULL, after_irq_exit, &g_array_index(hooks, LttvTraceHook, 5)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "process_fork", - "child_pid", NULL, NULL, process_fork, - &g_array_index(hooks, LttvTraceHook, 6)); - - lttv_trace_find_hook(ts->parent.parent.t, "core", "process_exit", NULL, - NULL, NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 7)); + 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_EVENT_SYSCALL_ENTRY, + LTT_FIELD_SYSCALL_ID, 0, 0, + after_syscall_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_SYSCALL_EXIT, + 0, 0, 0, + after_syscall_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_TRAP_ENTRY, + LTT_FIELD_TRAP_ID, 0, 0, + after_trap_entry, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_TRAP_EXIT, + 0, 0, 0, + after_trap_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_IRQ_ENTRY, + LTT_FIELD_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_EVENT_IRQ_EXIT, + 0, 0, 0, + after_irq_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + 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_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_EVENT_SCHED_SCHEDULE, + LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE, + after_schedchange, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_PROCESS_FORK, + LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0, + process_fork, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_PROCESS_EXIT, + LTT_FIELD_PID, 0, 0, + process_exit, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_PROCESS_FREE, + LTT_FIELD_PID, 0, 0, + process_free, NULL, + &g_array_index(hooks, LttvTraceHook, hn++)); + if(ret) hn--; + + ret = lttv_trace_find_hook(ts->parent.parent.t, + 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_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--; + + /* statedump-related hooks */ + ret = lttv_trace_find_hook(ts->parent.parent.t, + LTT_EVENT_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_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; /* Add these hooks to each event_by_id hooks list */ - nb_tracefile = ltt_trace_control_tracefile_number(ts->parent.parent.t) + - ltt_trace_per_cpu_tracefile_number(ts->parent.parent.t); + nb_tracefile = ts->parent.parent.tracefiles->len; for(j = 0 ; j < nb_tracefile ; j++) { - tfs = LTTV_TRACEFILE_STATS(ts->parent.parent.tracefiles[j]); + tfs = LTTV_TRACEFILE_STATS(g_array_index(ts->parent.parent.tracefiles, + LttvTracefileContext*, j)); lttv_hooks_add(tfs->parent.parent.event, every_event, NULL, LTTV_PRIO_DEFAULT); for(k = 0 ; k < before_hooks->len ; k++) { - hook = g_array_index(before_hooks, LttvTraceHook, k); - lttv_hooks_add(lttv_hooks_by_id_find( - tfs->parent.parent.event_by_id, - hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k), + th = &g_array_index(before_hooks, LttvTraceHook, k); + lttv_hooks_add( + lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id), + th->h, + th, LTTV_PRIO_STATS_BEFORE_STATE); } for(k = 0 ; k < after_hooks->len ; k++) { - hook = g_array_index(after_hooks, LttvTraceHook, k); - lttv_hooks_add(lttv_hooks_by_id_find( - tfs->parent.parent.event_by_id, - hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k), + th = &g_array_index(after_hooks, LttvTraceHook, k); + lttv_hooks_add( + lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id), + th->h, + th, LTTV_PRIO_STATS_AFTER_STATE); } } @@ -873,17 +1333,15 @@ void lttv_stats_remove_event_hooks(LttvTracesetStats *self) LttvTracefileStats *tfs; - void *hook_data; - GArray *before_hooks, *after_hooks; - LttvTraceHook hook; + LttvTraceHook *th; LttvAttributeValue val; nb_trace = lttv_traceset_number(traceset); for(i = 0 ; i < nb_trace ; i++) { - ts = LTTV_TRACE_STATS(self->parent.parent.traces[i]); + ts = (LttvTraceStats*)self->parent.parent.traces[i]; lttv_attribute_find(self->parent.parent.a, LTTV_STATS_BEFORE_HOOKS, LTTV_POINTER, &val); before_hooks = *(val.v_pointer); @@ -893,25 +1351,28 @@ void lttv_stats_remove_event_hooks(LttvTracesetStats *self) /* Remove these hooks from each event_by_id hooks list */ - nb_tracefile = ltt_trace_control_tracefile_number(ts->parent.parent.t) + - ltt_trace_per_cpu_tracefile_number(ts->parent.parent.t); + nb_tracefile = ts->parent.parent.tracefiles->len; for(j = 0 ; j < nb_tracefile ; j++) { - tfs = LTTV_TRACEFILE_STATS(ts->parent.parent.tracefiles[j]); + tfs = LTTV_TRACEFILE_STATS(g_array_index(ts->parent.parent.tracefiles, + LttvTracefileContext*, j)); lttv_hooks_remove_data(tfs->parent.parent.event, every_event, NULL); for(k = 0 ; k < before_hooks->len ; k++) { - hook = g_array_index(before_hooks, LttvTraceHook, k); + th = &g_array_index(before_hooks, LttvTraceHook, k); lttv_hooks_remove_data( - lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, - hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k)); + lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id), + th->h, + th); } for(k = 0 ; k < after_hooks->len ; k++) { - hook = g_array_index(after_hooks, LttvTraceHook, k); + th = &g_array_index(after_hooks, LttvTraceHook, k); lttv_hooks_remove_data( - lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, - hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k)); + lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id), + th->h, + th); + } } g_debug("lttv_stats_remove_event_hooks()"); @@ -929,9 +1390,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");