X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=7ffc37bd10acaf6727431608a939ae57f64ecedb;hb=8743690d339401db862834d50f9b6bbd1268271f;hp=fe12614144d30f3a6db80e38f1d556c596f96876;hpb=89f8741a6717b08fe5b9116660d5833e20d6dfda;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index fe126141..7ffc37bd 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -694,11 +694,11 @@ static gboolean before_schedchange(void *hook_data, void *call_data) guint pid_in, pid_out; - gint state_out; + gint64 state_out; 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); + state_out = ltt_event_get_long_int(e, thf->f3); /* compute the time for the process to schedule out */ mode_change(tfcs); @@ -718,13 +718,13 @@ static gboolean after_schedchange(void *hook_data, void *call_data) guint pid_in, pid_out; - gint state_out; + gint64 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); + state_out = ltt_event_get_long_int(e, thf->f3); /* get the information for the process scheduled in */ guint cpu = tfcs->parent.cpu; @@ -806,22 +806,35 @@ static gboolean every_event(void *hook_data, void *call_data) return FALSE; } -static void lttv_stats_cleanup_process_state(LttvTraceState *ts, - LttvProcessState *process) +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; + //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) { @@ -830,7 +843,9 @@ static void lttv_stats_cleanup_process_state(LttvTraceState *ts, process->current_function, process->state->t, process->state->n, &((*tfs)->current_events_tree), &((*tfs)->current_event_types_tree)); - mode_end(*tfs); + /* 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, @@ -840,25 +855,33 @@ static void lttv_stats_cleanup_process_state(LttvTraceState *ts, } while(cleanup_empty != 1); - (*tfs)->parent.parent.timestamp = save_time; + //(*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) +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]); + lttv_stats_cleanup_process_state(ts, ts->running_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, LttvAttribute *ts_stats) +lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats, + LttTime current_time) { LttvAttribute *sum_container = self->stats; @@ -897,7 +920,7 @@ lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats) /* First cleanup the state : sum all stalled information (never ending * states). */ if(!trace_is_summed) - lttv_stats_cleanup_state(self); + lttv_stats_cleanup_state(self, current_time); processes_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_PROCESSES); @@ -987,12 +1010,14 @@ lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats) 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; @@ -1014,7 +1039,7 @@ 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, self->stats); + lttv_stats_sum_trace(tcs, self->stats, current_time); // lttv_attribute_recursive_add(sum_container, tcs->stats); } } @@ -1077,14 +1102,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, + LTT_FACILITY_KERNEL_ARCH, 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_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT, 0, 0, 0, before_trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1119,8 +1144,8 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) 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, + LTT_FACILITY_KERNEL, 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--; @@ -1141,7 +1166,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) /* statedump-related hooks */ ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FACILITY_LIST, 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++)); @@ -1170,14 +1195,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) if(ret) hn--; ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, + LTT_FACILITY_KERNEL_ARCH, 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_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT, 0, 0, 0, after_trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1212,28 +1237,28 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) 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, + LTT_FACILITY_KERNEL, 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_FACILITY_PROCESS, LTT_EVENT_FORK, + LTT_FACILITY_KERNEL, 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_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FACILITY_KERNEL, 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_FACILITY_PROCESS, LTT_EVENT_FREE, + LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE, LTT_FIELD_PID, 0, 0, process_free, NULL, &g_array_index(hooks, LttvTraceHook, hn++)); @@ -1255,14 +1280,14 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) /* statedump-related hooks */ ret = lttv_trace_find_hook(ts->parent.parent.t, - LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FACILITY_LIST, 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_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END, + LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END, 0, 0, 0, after_statedump_end, NULL, &g_array_index(hooks, LttvTraceHook, hn++));