X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=c2fca6840c3757792621916a3e8cc99f190838a1;hb=953b68d7716a9b26922b5ecb2f1f5f40e18c55bc;hp=d5cd80b4aaa059e0e7aa39ac0f46294a456349ab;hpb=d8f124de0295aea546b6debf5945bfeea2bbeb2a;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index d5cd80b4..c2fca684 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -49,10 +49,8 @@ static GQuark LTTV_STATS_BEFORE_HOOKS, LTTV_STATS_AFTER_HOOKS; -static void remove_all_processes(GHashTable *processes); - static void -find_event_tree(LttvTracefileStats *tfcs, GQuark process, GQuark cpu, +find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, GQuark cpu, GQuark mode, GQuark sub_mode, LttvAttribute **events_tree, LttvAttribute **event_types_tree); @@ -80,9 +78,12 @@ init(LttvTracesetStats *self, LttvTraceset *ts) LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))-> init((LttvTracesetContext *)self, ts); - self->stats =lttv_attribute_find_subdir(self->parent.parent.ts_a,LTTV_STATS); - lttv_attribute_find(self->parent.parent.ts_a, LTTV_STATS_USE_COUNT, - LTTV_UINT, &v); + self->stats = lttv_attribute_find_subdir( + lttv_traceset_attribute(self->parent.parent.ts), + LTTV_STATS); + lttv_attribute_find(lttv_traceset_attribute(self->parent.parent.ts), + LTTV_STATS_USE_COUNT, + LTTV_UINT, &v); *(v.v_uint)++; if(*(v.v_uint) == 1) { @@ -92,7 +93,8 @@ init(LttvTracesetStats *self, LttvTraceset *ts) nb_trace = lttv_traceset_number(ts); for(i = 0 ; i < nb_trace ; i++) { - tcs = (LttvTraceStats *)tc = (LTTV_TRACESET_CONTEXT(self)->traces[i]); + tc = (LTTV_TRACESET_CONTEXT(self)->traces[i]); + tcs = (LttvTraceStats *)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, @@ -120,7 +122,6 @@ init(LttvTracesetStats *self, LttvTraceset *ts) } } - static void fini(LttvTracesetStats *self) { @@ -148,7 +149,6 @@ fini(LttvTracesetStats *self) if(*(v.v_uint) == 0) { lttv_attribute_remove_by_name(self->parent.parent.ts_a, LTTV_STATS); - lttv_attribute_recursive_free(self->stats); } self->stats = NULL; @@ -164,12 +164,10 @@ fini(LttvTracesetStats *self) if(*(v.v_uint) == 0) { lttv_attribute_remove_by_name(tcs->parent.parent.t_a,LTTV_STATS); - lttv_attribute_recursive_free(tcs->stats); tracefiles_stats = lttv_attribute_find_subdir(tcs->parent.parent.t_a, LTTV_STATS_TRACEFILES); lttv_attribute_remove_by_name(tcs->parent.parent.t_a, LTTV_STATS_TRACEFILES); - lttv_attribute_recursive_free(tracefiles_stats); } tcs->stats = NULL; @@ -177,7 +175,8 @@ fini(LttvTracesetStats *self) ltt_trace_per_cpu_tracefile_number(tc->t); for(j = 0 ; j < nb_tracefile ; j++) { - tfcs = ((LttvTracefileStats *)tfc = tc->tracefiles[j]); + tfc = tc->tracefiles[j]; + tfcs = (LttvTracefileStats *)tfc; tfcs->stats = NULL; tfcs->current_events_tree = NULL; tfcs->current_event_types_tree = NULL; @@ -251,11 +250,13 @@ lttv_traceset_stats_get_type(void) NULL, /* class_data */ sizeof (LttvTracesetStats), 0, /* n_preallocs */ - (GInstanceInitFunc) traceset_stats_instance_init /* instance_init */ + (GInstanceInitFunc) traceset_stats_instance_init, /* instance_init */ + NULL /* Value handling */ }; - type = g_type_register_static (LTTV_TRACESET_STATE_TYPE, "LttvTracesetStatsType", - &info, 0); + type = g_type_register_static (LTTV_TRACESET_STATE_TYPE, + "LttvTracesetStatsType", + &info, 0); } return type; } @@ -298,7 +299,8 @@ lttv_trace_stats_get_type(void) NULL, /* class_data */ sizeof (LttvTraceStats), 0, /* n_preallocs */ - (GInstanceInitFunc) trace_stats_instance_init /* instance_init */ + (GInstanceInitFunc) trace_stats_instance_init, /* instance_init */ + NULL /* Value handling */ }; type = g_type_register_static (LTTV_TRACE_STATE_TYPE, @@ -345,7 +347,8 @@ lttv_tracefile_stats_get_type(void) NULL, /* class_data */ sizeof (LttvTracefileStats), 0, /* n_preallocs */ - (GInstanceInitFunc) tracefile_stats_instance_init /* instance_init */ + (GInstanceInitFunc) tracefile_stats_instance_init, /* instance_init */ + NULL /* Value handling */ }; type = g_type_register_static (LTTV_TRACEFILE_STATE_TYPE, @@ -356,21 +359,25 @@ lttv_tracefile_stats_get_type(void) static void -find_event_tree(LttvTracefileStats *tfcs, GQuark process, GQuark cpu, - GQuark mode, GQuark sub_mode, LttvAttribute **events_tree, - LttvAttribute **event_types_tree) +find_event_tree(LttvTracefileStats *tfcs, + GQuark pid_time, + GQuark cpu, + GQuark mode, + GQuark sub_mode, + LttvAttribute **events_tree, + LttvAttribute **event_types_tree) { LttvAttribute *a; LttvTraceStats *tcs = LTTV_TRACE_STATS(tfcs->parent.parent.t_context); a = lttv_attribute_find_subdir(tcs->stats, LTTV_STATS_PROCESSES); - a = lttv_attribute_find_subdir(a, tfcs->parent.process->pid_time); + a = lttv_attribute_find_subdir(a, pid_time); a = lttv_attribute_find_subdir(a, LTTV_STATS_CPU); - a = lttv_attribute_find_subdir(a, tfcs->parent.cpu_name); + a = lttv_attribute_find_subdir(a, cpu); a = lttv_attribute_find_subdir(a, LTTV_STATS_MODE_TYPES); - a = lttv_attribute_find_subdir(a, tfcs->parent.process->state->t); + a = lttv_attribute_find_subdir(a, mode); a = lttv_attribute_find_subdir(a, LTTV_STATS_SUBMODES); - a = lttv_attribute_find_subdir(a, tfcs->parent.process->state->n); + a = lttv_attribute_find_subdir(a, sub_mode); *events_tree = a; a = lttv_attribute_find_subdir(a, LTTV_STATS_EVENT_TYPES); *event_types_tree = a; @@ -381,7 +388,8 @@ 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, + find_event_tree(tfcs, tfcs->parent.process->pid_time, + tfcs->parent.cpu_name, es->t, es->n, &(tfcs->current_events_tree), &(tfcs->current_event_types_tree)); } @@ -576,7 +584,7 @@ gboolean every_event(void *hook_data, void *call_data) void lttv_stats_sum_trace(LttvTraceStats *self) { - LttvTraceStats *tcs; + LttvAttribute *sum_container = self->stats; LttvAttributeType type; @@ -595,16 +603,18 @@ lttv_stats_sum_trace(LttvTraceStats *self) *cpu_events_tree, *process_modes_tree, *trace_cpu_tree, *trace_modes_tree; - main_tree = self->stats; + main_tree = sum_container; - lttv_attribute_find(self->parent.parent.t_a, LTTV_STATS_SUMMED, - LTTV_UINT, &value); + lttv_attribute_find(sum_container, + LTTV_STATS_SUMMED, + LTTV_UINT, &value); if(*(value.v_uint) != 0) return; *(value.v_uint) = 1; processes_tree = lttv_attribute_find_subdir(main_tree, - LTTV_STATS_PROCESSES); - trace_modes_tree = lttv_attribute_find_subdir(main_tree, LTTV_STATS_MODES); + 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++) { @@ -666,10 +676,17 @@ 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); + return 0; +} + void lttv_stats_sum_traceset(LttvTracesetStats *self) { LttvTraceset *traceset = self->parent.parent.ts; + LttvAttribute *sum_container = self->stats; LttvTraceStats *tcs; @@ -679,12 +696,12 @@ lttv_stats_sum_traceset(LttvTracesetStats *self) LttvAttributeValue value; - lttv_attribute_find(self->parent.parent.ts_a, LTTV_STATS_SUMMED, + lttv_attribute_find(sum_container, LTTV_STATS_SUMMED, LTTV_UINT, &value); if(*(value.v_uint) != 0) return; *(value.v_uint) = 1; - traceset_modes_tree = lttv_attribute_find_subdir(self->stats, + traceset_modes_tree = lttv_attribute_find_subdir(sum_container, LTTV_STATS_MODES); nb_trace = lttv_traceset_number(traceset); @@ -698,7 +715,17 @@ lttv_stats_sum_traceset(LttvTracesetStats *self) } -lttv_stats_add_event_hooks(LttvTracesetStats *self) +// Hook wrapper. call_data is a traceset context. +gboolean lttv_stats_hook_add_event_hooks(void *hook_data, void *call_data) +{ + LttvTracesetStats *tss = (LttvTracesetStats*)call_data; + + lttv_stats_add_event_hooks(tss); + + return 0; +} + +void lttv_stats_add_event_hooks(LttvTracesetStats *self) { LttvTraceset *traceset = self->parent.parent.ts; @@ -789,26 +816,29 @@ lttv_stats_add_event_hooks(LttvTracesetStats *self) after_hooks = hooks; - /* Add these hooks to each before_event_by_id hooks list */ + /* 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); for(j = 0 ; j < nb_tracefile ; j++) { tfs = LTTV_TRACEFILE_STATS(ts->parent.parent.tracefiles[j]); - lttv_hooks_add(tfs->parent.parent.after_event, every_event, NULL); + 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.before_event_by_id, - hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k)); + tfs->parent.parent.event_by_id, + hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k), + 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.after_event_by_id, - hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k)); + tfs->parent.parent.event_by_id, + hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k), + LTTV_PRIO_STATS_AFTER_STATE); } } lttv_attribute_find(self->parent.parent.a, LTTV_STATS_BEFORE_HOOKS, @@ -820,8 +850,17 @@ lttv_stats_add_event_hooks(LttvTracesetStats *self) } } +// Hook wrapper. call_data is a traceset context. +gboolean lttv_stats_hook_remove_event_hooks(void *hook_data, void *call_data) +{ + LttvTracesetStats *tss = (LttvTracesetStats*)call_data; + + lttv_stats_remove_event_hooks(tss); + + return 0; +} -lttv_stats_remove_event_hooks(LttvTracesetStats *self) +void lttv_stats_remove_event_hooks(LttvTracesetStats *self) { LttvTraceset *traceset = self->parent.parent.ts; @@ -849,26 +888,26 @@ lttv_stats_remove_event_hooks(LttvTracesetStats *self) LTTV_POINTER, &val); after_hooks = *(val.v_pointer); - /* Add these hooks to each before_event_by_id hooks list */ + /* 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); for(j = 0 ; j < nb_tracefile ; j++) { tfs = LTTV_TRACEFILE_STATS(ts->parent.parent.tracefiles[j]); - lttv_hooks_remove_data(tfs->parent.parent.after_event, every_event, + 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); lttv_hooks_remove_data( - lttv_hooks_by_id_find(tfs->parent.parent.before_event_by_id, + lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k)); } for(k = 0 ; k < after_hooks->len ; k++) { hook = g_array_index(after_hooks, LttvTraceHook, k); lttv_hooks_remove_data( - lttv_hooks_by_id_find(tfs->parent.parent.after_event_by_id, + lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k)); } }