* MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <lttv/module.h>
#include <ltt/facility.h>
#include <ltt/trace.h>
#include <ltt/event.h>
+#include <ltt/type.h>
#define BUF_SIZE 256
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);
LttvTracefileContext *tfc;
+ LttvTracefileContext **tfs;
LttvTracefileStats *tfcs;
LttTime timestamp = {0,0};
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) {
nb_trace = lttv_traceset_number(ts);
for(i = 0 ; i < nb_trace ; i++) {
- tcs = (LttvTraceStats *)tc = (LTTV_TRACESET_CONTEXT(self)->traces[i]);
+ 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,
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);
find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN,
}
}
-
static void
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;
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;
- 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 = ((LttvTracefileStats *)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;
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;
}
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,
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,
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);
+ LttvTraceStats *tcs = (LttvTraceStats*)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;
{
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));
}
gboolean before_schedchange(void *hook_data, void *call_data)
{
- LttvTraceHook *h = (LttvTraceHook *)hook_data;
-
LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
- guint pid_in, pid_out, state_out;
+ 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_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);
+ 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);
/* compute the time for the process to schedule out */
return FALSE;
}
+gboolean process_free(void *hook_data, void *call_data)
+{
+ return FALSE;
+}
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.
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;
void
lttv_stats_sum_trace(LttvTraceStats *self)
{
- LttvTraceStats *tcs;
+ LttvAttribute *sum_container = self->stats;
LttvAttributeType type;
*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++) {
}
+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;
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);
}
-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)
{
- LttvTraceset *traceset = self->parent.parent.ts;
+ LttvTracesetStats *tss = (LttvTracesetStats*)call_data;
- guint i, j, k, nb_trace, nb_tracefile;
+ lttv_stats_add_event_hooks(tss);
- LttFacility *f;
+ return 0;
+}
- LttEventType *et;
+void lttv_stats_add_event_hooks(LttvTracesetStats *self)
+{
+ LttvTraceset *traceset = self->parent.parent.ts;
+
+ guint i, j, k, l, nb_trace, nb_tracefile;
LttvTraceStats *ts;
LttvTracefileStats *tfs;
- void *hook_data;
-
GArray *hooks, *before_hooks, *after_hooks;
- LttvTraceHook hook;
+ LttvTraceHook *hook;
+
+ LttvTraceHookByFacility *thf;
LttvAttributeValue val;
+ gint ret;
+
nb_trace = lttv_traceset_number(traceset);
for(i = 0 ; i < nb_trace ; i++) {
ts = (LttvTraceStats *)self->parent.parent.traces[i];
/* Find the eventtype id for the following events and register the
associated by id hooks. */
- hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook));
+ hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 7);
g_array_set_size(hooks, 7);
- lttv_trace_find_hook(ts->parent.parent.t, "core","syscall_entry",
- "syscall_id", NULL, NULL, before_syscall_entry,
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
+ LTT_FIELD_SYSCALL_ID, 0, 0,
+ before_syscall_entry,
&g_array_index(hooks, LttvTraceHook, 0));
+ g_assert(!ret);
- lttv_trace_find_hook(ts->parent.parent.t, "core", "syscall_exit", NULL,
- NULL, NULL, before_syscall_exit,
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT,
+ 0, 0, 0,
+ before_syscall_exit,
&g_array_index(hooks, LttvTraceHook, 1));
+ g_assert(!ret);
- lttv_trace_find_hook(ts->parent.parent.t, "core", "trap_entry", "trap_id",
- NULL, NULL, before_trap_entry,
+ 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,
&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));
+ 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));
+ 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));
+ 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));
+ 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,
+ &g_array_index(hooks, LttvTraceHook, 6));
+ g_assert(!ret);
before_hooks = hooks;
- hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook));
- g_array_set_size(hooks, 8);
+ hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 9);
+ g_array_set_size(hooks, 9);
- lttv_trace_find_hook(ts->parent.parent.t, "core","syscall_entry",
- "syscall_id", NULL, NULL, after_syscall_entry,
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
+ LTT_FIELD_SYSCALL_ID, 0, 0,
+ after_syscall_entry,
&g_array_index(hooks, LttvTraceHook, 0));
+ g_assert(!ret);
- lttv_trace_find_hook(ts->parent.parent.t, "core", "syscall_exit", NULL,
- NULL, NULL, after_syscall_exit,
+ ret = lttv_trace_find_hook(ts->parent.parent.t,
+ LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT,
+ 0, 0, 0,
+ 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_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));
+ 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));
+ 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));
+ 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));
+ 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,
&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));
+ 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));
+ g_assert(!ret);
- lttv_trace_find_hook(ts->parent.parent.t, "core", "process_exit", NULL,
- NULL, NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 7));
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);
+ nb_tracefile = ts->parent.parent.tracefiles->len;
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);
+ 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.before_event_by_id,
- hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k));
+ hook = &g_array_index(before_hooks, LttvTraceHook, k);
+ for(l = 0; l<hook->fac_list->len;l++) {
+ thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
+ lttv_hooks_add(
+ lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
+ thf->h,
+ thf,
+ 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));
+ hook = &g_array_index(after_hooks, LttvTraceHook, k);
+ for(l = 0; l<hook->fac_list->len;l++) {
+ thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
+ lttv_hooks_add(
+ lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
+ thf->h,
+ thf,
+ LTTV_PRIO_STATS_AFTER_STATE);
+ }
}
}
lttv_attribute_find(self->parent.parent.a, LTTV_STATS_BEFORE_HOOKS,
}
}
+// 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);
-lttv_stats_remove_event_hooks(LttvTracesetStats *self)
+ return 0;
+}
+
+void lttv_stats_remove_event_hooks(LttvTracesetStats *self)
{
LttvTraceset *traceset = self->parent.parent.ts;
- guint i, j, k, nb_trace, nb_tracefile;
+ guint i, j, k, l, nb_trace, nb_tracefile;
LttvTraceStats *ts;
GArray *before_hooks, *after_hooks;
- LttvTraceHook hook;
+ LttvTraceHook *hook;
+
+ LttvTraceHookByFacility *thf;
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);
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);
+ nb_tracefile = ts->parent.parent.tracefiles->len;
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,
+ 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);
- lttv_hooks_remove_data(
- lttv_hooks_by_id_find(tfs->parent.parent.before_event_by_id,
- hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k));
+ hook = &g_array_index(before_hooks, LttvTraceHook, k);
+ for(l = 0 ; l < hook->fac_list->len ; l++) {
+ thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
+ lttv_hooks_remove_data(
+ lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
+ thf->h,
+ thf);
+ }
}
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,
- hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k));
+ hook = &g_array_index(after_hooks, LttvTraceHook, k);
+ for(l = 0 ; l < hook->fac_list->len ; l++) {
+ thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
+ lttv_hooks_remove_data(
+ lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, thf->id),
+ thf->h,
+ thf);
+ }
}
}
g_debug("lttv_stats_remove_event_hooks()");