X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=330166ba2c33645c7295a77807cbc8dc7d29b392;hb=6e6aafc59900995ab9a96619fa948bc705339da2;hp=fa697d0c0dfe11c044684558ef5743fd22953ae6;hpb=c47a6dc6fb544baff5b6fe977c992822693208b8;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c
index fa697d0c..330166ba 100644
--- a/ltt/branches/poly/lttv/lttv/stats.c
+++ b/ltt/branches/poly/lttv/lttv/stats.c
@@ -16,6 +16,9 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <lttv/module.h>
@@ -49,10 +52,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 +81,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) { 
@@ -106,11 +110,11 @@ init(LttvTracesetStats *self, LttvTraceset *ts)
       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]);
+      tfcs = LTTV_TRACEFILE_STATS(&g_array_index(tc->tracefiles,
+                      LttvTracefileContext, j));
       tfcs->stats = lttv_attribute_find_subdir(tracefiles_stats, 
           tfcs->parent.cpu_name);
       find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN,
@@ -121,7 +125,6 @@ init(LttvTracesetStats *self, LttvTraceset *ts)
   }
 }
 
-
 static void
 fini(LttvTracesetStats *self)
 {
@@ -171,11 +174,11 @@ fini(LttvTracesetStats *self)
     }
     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++) {
-      tfc = tc->tracefiles[j];
+      tfc = &g_array_index(tc->tracefiles,
+                                  LttvTracefileContext, j);
       tfcs = (LttvTracefileStats *)tfc;
       tfcs->stats = NULL;
       tfcs->current_events_tree = NULL;
@@ -250,11 +253,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;
 }
@@ -297,7 +302,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, 
@@ -344,7 +350,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, 
@@ -355,21 +362,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;
@@ -380,7 +391,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));
 }
@@ -506,17 +518,21 @@ gboolean after_irq_exit(void *hook_data, void *call_data)
 
 gboolean before_schedchange(void *hook_data, void *call_data)
 {
-  LttvTraceHook *h = (LttvTraceHook *)hook_data;
-
   LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
+  LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf);
+
+  LttvTraceHookByFacility *thf =
+        lttv_trace_hook_get_fac((LttvTraceHook *)hook_data, 
+                                 ltt_event_facility_id(e));
+
   guint pid_in, pid_out, 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_unsigned(e, thf->f3);
 
   /* compute the time for the process to schedule out */
 
@@ -551,11 +567,17 @@ gboolean process_exit(void *hook_data, void *call_data)
   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.
@@ -564,8 +586,7 @@ gboolean every_event(void *hook_data, void *call_data)
      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;
@@ -575,7 +596,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;
 
@@ -594,16 +615,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++) {
@@ -665,10 +688,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;
 
@@ -678,12 +708,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);
 
@@ -697,11 +727,21 @@ 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;
 
-  guint i, j, k, nb_trace, nb_tracefile;
+  guint i, j, k, l, nb_trace, nb_tracefile;
 
   LttFacility *f;
 
@@ -715,7 +755,9 @@ lttv_stats_add_event_hooks(LttvTracesetStats *self)
 
   GArray *hooks, *before_hooks, *after_hooks;
 
-  LttvTraceHook hook;
+  LttvTraceHook *hook;
+
+  LttvTraceHookByFacility *thf;
 
   LttvAttributeValue val;
 
@@ -726,91 +768,136 @@ lttv_stats_add_event_hooks(LttvTracesetStats *self)
     /* 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, 
+    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));
 
-    lttv_trace_find_hook(ts->parent.parent.t, "core", "syscall_exit", NULL, 
-        NULL, NULL, before_syscall_exit, 
+    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));
 
-    lttv_trace_find_hook(ts->parent.parent.t, "core", "trap_entry", "trap_id",
-	NULL, NULL, before_trap_entry, 
+    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));
+    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));
+
+    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));
+
+    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));
+
+    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));
 
     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, 
+    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));
 
-    lttv_trace_find_hook(ts->parent.parent.t, "core", "syscall_exit", NULL, 
-        NULL, NULL, after_syscall_exit, 
+    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,
+        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, 
+        LTT_FIELD_TRAP_ID, 0, 0,
+        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,
+        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
+        0, 0, 0,
+        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,
+        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY, 
+        LTT_FIELD_IRQ_ID, 0, 0,
+        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,
+        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
+        0, 0, 0,
+        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, 
+
+    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));
 
-    lttv_trace_find_hook(ts->parent.parent.t, "core", "process_exit", NULL, 
-        NULL, NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 7));
+    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));
+    
+    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, 7));
+
 
     after_hooks = hooks;
 
     /* 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]);
+      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.event_by_id, 
-	    hook.id), hook.h, &g_array_index(before_hooks, LttvTraceHook, k),
-            LTTV_PRIO_STATS_BEFORE_STATE);
+        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,
+              &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.event_by_id, 
-	    hook.id), hook.h, &g_array_index(after_hooks, LttvTraceHook, k),
-            LTTV_PRIO_STATS_AFTER_STATE);
+        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,
+              &g_array_index(after_hooks, LttvTraceHook, k),
+              LTTV_PRIO_STATS_AFTER_STATE);
+        }
       }
     }
     lttv_attribute_find(self->parent.parent.a, LTTV_STATS_BEFORE_HOOKS, 
@@ -822,12 +909,21 @@ 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(LttvTracesetStats *self)
+   lttv_stats_remove_event_hooks(tss);
+
+   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;
 
@@ -837,7 +933,9 @@ lttv_stats_remove_event_hooks(LttvTracesetStats *self)
 
   GArray *before_hooks, *after_hooks;
 
-  LttvTraceHook hook;
+  LttvTraceHook *hook;
+  
+  LttvTraceHookByFacility *thf;
 
   LttvAttributeValue val;
 
@@ -853,25 +951,33 @@ lttv_stats_remove_event_hooks(LttvTracesetStats *self)
 
     /* 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]);
+      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.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,
+              &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.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,
+              &g_array_index(after_hooks, LttvTraceHook, k));
+        }
       }
     }
     g_debug("lttv_stats_remove_event_hooks()");