#include <ltt/type.h>
#define BUF_SIZE 256
+#define MAX_64_HEX_STRING_LEN 19
GQuark
LTTV_STATS_PROCESS_UNKNOWN,
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_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);
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;
find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN,
- ltt_tracefile_long_name(tfcs->parent.parent.tf),
+ cpu,
+ 0x0ULL,
LTTV_STATE_MODE_UNKNOWN,
LTTV_STATE_SUBMODE_UNKNOWN, &tfcs->current_events_tree,
&tfcs->current_event_types_tree);
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;
+ LttvAttribute *a, *prev_a;
+ gchar fstring[MAX_64_HEX_STRING_LEN];
+ gint ret;
+
+ 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);
LttvExecutionState *es = process->state;
find_event_tree(tfcs, process->pid_time,
- ltt_tracefile_long_name(tfcs->parent.parent.tf),
+ cpu,
+ process->current_function,
es->t, es->n, &(tfcs->current_events_tree),
&(tfcs->current_event_types_tree));
}
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;
- 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);
+
+ lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME,
+ LTTV_TIME, &cpu_time);
*(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;
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);
+
+ 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);
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 after_trap_exit(void *hook_data, void *call_data)
{
- update_event_tree((LttvTracefileStats *)call_data);
+ after_mode_end((LttvTracefileStats *)call_data);
return FALSE;
}
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 after_soft_irq_exit(void *hook_data, void *call_data)
+{
+ after_mode_end((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+gboolean before_function_entry(void *hook_data, void *call_data)
+{
+ mode_change((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+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)
+{
+ mode_end((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+gboolean after_function_exit(void *hook_data, void *call_data)
+{
+ after_mode_end((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
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);
mode_change(tfcs);
- /* get the information for the process scheduled in */
+ return FALSE;
+}
+
+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(ts,
- ANY_CPU, pid_in, &tfcs->parent.parent.timestamp);
+ 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,
- ltt_tracefile_long_name(tfcs->parent.parent.tf),
+ 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;
-}
+ return FALSE;
+}
gboolean process_fork(void *hook_data, void *call_data)
{
return FALSE;
}
+gboolean before_enum_process_state(void *hook_data, void *call_data)
+{
+ mode_end((LttvTracefileStats *)call_data);
+ after_mode_end((LttvTracefileStats *)call_data);
+ mode_change((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
+gboolean after_enum_process_state(void *hook_data, void *call_data)
+{
+ update_event_tree((LttvTracefileStats *)call_data);
+ return FALSE;
+}
+
gboolean process_free(void *hook_data, void *call_data)
{
return FALSE;
return FALSE;
}
+static void lttv_stats_cleanup_process_state(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ LttvTraceStats *tcs = (LttvTraceStats *)user_data;
+ LttvTraceState *ts = (LttvTraceState *)user_data;
+ LttvTracesetContext *tsc = ts->parent.ts_context;
+ LttvProcessState *process = (LttvProcessState *)value;
+ 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));
+ /* if it is a running mode, we must count its cpu time */
+ if(process->state->s == LTTV_STATE_RUN)
+ 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 process in the state, for each of their stacked states,
+ * perform sum of needed values. */
+static void lttv_stats_cleanup_state(LttvTraceStats *tcs)
+{
+ LttvTraceState *ts = (LttvTraceState *)tcs;
+
+ /* Does not work correctly FIXME. */
+ g_hash_table_foreach(ts->processes, lttv_stats_cleanup_process_state,
+ tcs);
+}
void
-lttv_stats_sum_trace(LttvTraceStats *self)
+lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
{
LttvAttribute *sum_container = self->stats;
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);
+
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);
- }
- 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);
- }
- lttv_attribute_recursive_add(process_modes_tree, cpu_tree);
- lttv_attribute_recursive_add(trace_cpu_tree, cpu_tree);
+ 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);
+ }
+ }
+ 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(trace_modes_tree, process_modes_tree);
}
}
int i, nb_trace;
- LttvAttribute *main_tree, *trace_modes_tree, *traceset_modes_tree;
+ LttvAttribute *main_tree;
LttvAttributeValue value;
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);
+ // lttv_attribute_recursive_add(sum_container, tcs->stats);
}
}
LttvAttributeValue val;
gint ret;
+ gint hn;
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
/* Find the eventtype id for the following events and register the
associated by id hooks. */
- hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 9);
- g_array_set_size(hooks, 9);
+ 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,
LTT_FIELD_SYSCALL_ID, 0, 0,
before_syscall_entry, NULL,
- &g_array_index(hooks, LttvTraceHook, 0));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
0, 0, 0,
before_syscall_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 1));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
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, NULL,
- &g_array_index(hooks, LttvTraceHook, 2));
- g_assert(!ret);
+ &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,
0, 0, 0,
before_trap_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 3));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
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, NULL,
- &g_array_index(hooks, LttvTraceHook, 4));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
0, 0, 0,
before_irq_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 5));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
LTT_FIELD_SOFT_IRQ_ID, 0, 0,
before_soft_irq_entry, NULL,
- &g_array_index(hooks, LttvTraceHook, 6));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
0, 0, 0,
before_soft_irq_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 7));
- g_assert(!ret);
+ &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,
before_schedchange, NULL,
- &g_array_index(hooks, LttvTraceHook, 8));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
+
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_USER_GENERIC, 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_FACILITY_USER_GENERIC, 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_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), 11);
- g_array_set_size(hooks, 11);
+ hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 15);
+ g_array_set_size(hooks, 15);
+ hn=0;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
LTT_FIELD_SYSCALL_ID, 0, 0,
after_syscall_entry, NULL,
- &g_array_index(hooks, LttvTraceHook, 0));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
0, 0, 0,
after_syscall_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 1));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
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, NULL,
- &g_array_index(hooks, LttvTraceHook, 2));
- g_assert(!ret);
+ &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,
0, 0, 0,
after_trap_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 3));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
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, NULL,
- &g_array_index(hooks, LttvTraceHook, 4));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
0, 0, 0,
after_irq_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 5));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
LTT_FIELD_SOFT_IRQ_ID, 0, 0,
after_irq_entry, NULL,
- &g_array_index(hooks, LttvTraceHook, 6));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
ret = lttv_trace_find_hook(ts->parent.parent.t,
LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
0, 0, 0,
after_soft_irq_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 7));
- g_assert(!ret);
+ &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,
process_fork, NULL,
- &g_array_index(hooks, LttvTraceHook, 8));
- g_assert(!ret);
+ &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_FIELD_PID, 0, 0,
process_exit, NULL,
- &g_array_index(hooks, LttvTraceHook, 9));
- g_assert(!ret);
+ &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_FIELD_PID, 0, 0,
process_free, NULL,
- &g_array_index(hooks, LttvTraceHook, 10));
- g_assert(!ret);
+ &g_array_index(hooks, LttvTraceHook, hn++));
+ if(ret) hn--;
+
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_USER_GENERIC, 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_FACILITY_USER_GENERIC, 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_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--;
+ g_array_set_size(hooks, hn);
after_hooks = hooks;
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_SUBMODES = g_quark_from_string("functions");
+ 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");
projects / lttv.git / blobdiff