X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=23a9cca8481b0848f17bc0855fdc068d4be3aa73;hb=fadb18a9c4eed454c8a8f9595222e0360e6edb07;hp=00e8811004dfda3f594e35ad19afeededd227e76;hpb=327a43149d62f1984112e1ef022ef039897f78ad;p=lttv.git diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c index 00e88110..23a9cca8 100644 --- a/ltt/branches/poly/lttv/lttv/stats.c +++ b/ltt/branches/poly/lttv/lttv/stats.c @@ -28,6 +28,7 @@ #include #include #include +#include #define BUF_SIZE 256 @@ -46,9 +47,7 @@ GQuark 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; @@ -57,8 +56,8 @@ find_event_tree(LttvTracefileStats *tfcs, GQuark pid_time, GQuark cpu, 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; @@ -79,8 +78,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), @@ -89,7 +87,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); } @@ -106,7 +104,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); } @@ -118,17 +116,18 @@ init(LttvTracesetStats *self, LttvTraceset *ts) 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)); find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN, - tfcs->parent.cpu_name, LTTV_STATE_MODE_UNKNOWN, + ltt_tracefile_long_name(tfcs->parent.parent.tf), + 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; @@ -150,7 +149,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); @@ -165,7 +164,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); @@ -187,6 +186,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); } @@ -391,10 +416,13 @@ find_event_tree(LttvTracefileStats *tfcs, static void update_event_tree(LttvTracefileStats *tfcs) { - LttvExecutionState *es = tfcs->parent.process->state; + LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; + guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf); + LttvProcessState *process = ts->running_process[cpu]; + LttvExecutionState *es = process->state; - find_event_tree(tfcs, tfcs->parent.process->pid_time, - tfcs->parent.cpu_name, + find_event_tree(tfcs, process->pid_time, + ltt_tracefile_long_name(tfcs->parent.parent.tf), es->t, es->n, &(tfcs->current_events_tree), &(tfcs->current_event_types_tree)); } @@ -402,6 +430,9 @@ 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); + LttvProcessState *process = ts->running_process[cpu]; LttvAttributeValue cpu_time; LttTime delta; @@ -409,13 +440,16 @@ static void mode_change(LttvTracefileStats *tfcs) 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); + process->state->change); *(cpu_time.v_time) = ltt_time_add(*(cpu_time.v_time), delta); } static void mode_end(LttvTracefileStats *tfcs) { + LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context; + guint cpu = ltt_tracefile_num(tfcs->parent.parent.tf); + LttvProcessState *process = ts->running_process[cpu]; LttvAttributeValue elapsed_time, cpu_time; LttTime delta; @@ -423,13 +457,13 @@ static void mode_end(LttvTracefileStats *tfcs) 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); + process->state->entry); *(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); + process->state->change); *(cpu_time.v_time) = ltt_time_add(*(cpu_time.v_time), delta); } @@ -522,6 +556,8 @@ gboolean before_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; @@ -542,9 +578,11 @@ gboolean before_schedchange(void *hook_data, void *call_data) /* get the information for the process scheduled in */ - process = lttv_state_find_process_or_create(&(tfcs->parent), pid_in); + process = lttv_state_find_process_or_create(ts, + ANY_CPU, pid_in, &tfcs->parent.parent.timestamp); - find_event_tree(tfcs, process->pid_time, tfcs->parent.cpu_name, + find_event_tree(tfcs, process->pid_time, + ltt_tracefile_long_name(tfcs->parent.parent.tf), process->state->t, process->state->n, &(tfcs->current_events_tree), &(tfcs->current_event_types_tree)); @@ -770,48 +808,51 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) g_array_set_size(hooks, 7); 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, + before_syscall_entry, NULL, &g_array_index(hooks, LttvTraceHook, 0)); g_assert(!ret); 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, + before_syscall_exit, NULL, &g_array_index(hooks, LttvTraceHook, 1)); g_assert(!ret); 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, + before_trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, 2)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, 0, 0, 0, - before_trap_exit, &g_array_index(hooks, LttvTraceHook, 3)); + before_trap_exit, NULL, + &g_array_index(hooks, LttvTraceHook, 3)); g_assert(!ret); 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, &g_array_index(hooks, LttvTraceHook, 4)); + before_irq_entry, NULL, + &g_array_index(hooks, LttvTraceHook, 4)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT, 0, 0, 0, - before_irq_exit, &g_array_index(hooks, LttvTraceHook, 5)); + before_irq_exit, NULL, + &g_array_index(hooks, LttvTraceHook, 5)); g_assert(!ret); 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, + before_schedchange, NULL, &g_array_index(hooks, LttvTraceHook, 6)); g_assert(!ret); @@ -821,61 +862,67 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self) g_array_set_size(hooks, 9); 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, + after_syscall_entry, NULL, &g_array_index(hooks, LttvTraceHook, 0)); g_assert(!ret); 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, + after_syscall_exit, NULL, &g_array_index(hooks, LttvTraceHook, 1)); g_assert(!ret); 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, &g_array_index(hooks, LttvTraceHook, 2)); + after_trap_entry, NULL, + &g_array_index(hooks, LttvTraceHook, 2)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, 0, 0, 0, - after_trap_exit, &g_array_index(hooks, LttvTraceHook, 3)); + after_trap_exit, NULL, + &g_array_index(hooks, LttvTraceHook, 3)); g_assert(!ret); 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, &g_array_index(hooks, LttvTraceHook, 4)); + after_irq_entry, NULL, + &g_array_index(hooks, LttvTraceHook, 4)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT, 0, 0, 0, - after_irq_exit, &g_array_index(hooks, LttvTraceHook, 5)); + after_irq_exit, NULL, + &g_array_index(hooks, LttvTraceHook, 5)); g_assert(!ret); 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, + process_fork, NULL, &g_array_index(hooks, LttvTraceHook, 6)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, LTT_FIELD_PID, 0, 0, - process_exit, &g_array_index(hooks, LttvTraceHook, 7)); + process_exit, NULL, + &g_array_index(hooks, LttvTraceHook, 7)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.parent.t, LTT_FACILITY_PROCESS, LTT_EVENT_FREE, LTT_FIELD_PID, 0, 0, - process_free, &g_array_index(hooks, LttvTraceHook, 8)); + process_free, NULL, + &g_array_index(hooks, LttvTraceHook, 8)); g_assert(!ret);