X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=0bfb45462d9d6eee7fa5207b795afb36a3f2acb5;hb=60c5092c6e979b8cc1c9b762de473857d0ac7c97;hp=c71b204538621e50c4024182e3baac9a43fbcb5f;hpb=15f3a340cafb619cc5af27ef60da41f880e9828f;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c
index c71b2045..0bfb4546 100644
--- a/ltt/branches/poly/lttv/lttv/stats.c
+++ b/ltt/branches/poly/lttv/lttv/stats.c
@@ -25,10 +25,8 @@
 #include <lttv/stats.h>
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
-#include <ltt/facility.h>
 #include <ltt/trace.h>
 #include <ltt/event.h>
-#include <ltt/type.h>
 
 #define BUF_SIZE 256
 #define MAX_64_HEX_STRING_LEN 19
@@ -69,18 +67,12 @@ static void lttv_stats_init(LttvTracesetStats *self)
 
   LttvTraceStats *tcs;
 
-  LttvTracefileContext *tfc;
-
   LttvTracefileContext **tfs;
   LttvTracefileStats *tfcs;
   
-  LttTime timestamp = {0,0};
-
   LttvAttributeValue v;
 
-  LttvAttribute
-    *stats_tree,
-    *tracefiles_stats;
+  LttvAttribute *tracefiles_stats;
 
   LttvTraceset *ts = self->parent.parent.ts;
 
@@ -147,8 +139,6 @@ static void lttv_stats_fini(LttvTracesetStats *self)
 
   LttvTracefileStats *tfcs;
   
-  LttTime timestamp = {0,0};
-
   LttvAttributeValue v;
 
   LttvAttribute *tracefiles_stats;
@@ -393,7 +383,6 @@ lttv_tracefile_stats_get_type(void)
   return type;
 }
 
-
 static void
 find_event_tree(LttvTracefileStats *tfcs,
                 GQuark pid_time,
@@ -404,7 +393,7 @@ find_event_tree(LttvTracefileStats *tfcs,
                 LttvAttribute **events_tree, 
                 LttvAttribute **event_types_tree)
 {
-  LttvAttribute *a, *prev_a;
+  LttvAttribute *a;
   gchar fstring[MAX_64_HEX_STRING_LEN];
   gint ret;
 
@@ -429,10 +418,9 @@ find_event_tree(LttvTracefileStats *tfcs,
   *event_types_tree = a;
 }
 
-
-/* Update the trace event tree for the specified cpu */
-static void update_trace_event_tree(LttvTracefileStats *tfcs, guint cpu)
+static void update_event_tree(LttvTracefileStats *tfcs)
 {
+  guint cpu = tfcs->parent.cpu;
   LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
   LttvExecutionState *es = process->state;
@@ -444,9 +432,21 @@ static void update_trace_event_tree(LttvTracefileStats *tfcs, guint cpu)
       &(tfcs->current_event_types_tree));
 }
 
-static void update_event_tree(LttvTracefileStats *tfcs)
+
+/* Update the trace event tree for the specified cpu */
+static void update_trace_event_tree(LttvTraceStats *tcs)
 {
-  update_trace_event_tree(tfcs, tfcs->parent.cpu);
+  LttvTracefileStats *tfcs;
+  LttvTraceContext *tc = (LttvTraceContext*)tcs;
+  guint j, nb_tracefile;
+
+  /* For each tracefile, update the event tree */
+  nb_tracefile = tc->tracefiles->len;
+  for(j = 0; j < nb_tracefile; j++) {
+    tfcs = LTTV_TRACEFILE_STATS(g_array_index(tc->tracefiles,
+       LttvTracefileContext*, j));
+    update_event_tree(tfcs);
+  }
 }
 
 static void mode_change(LttvTracefileStats *tfcs)
@@ -454,7 +454,7 @@ static void mode_change(LttvTracefileStats *tfcs)
   LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
   guint cpu = tfcs->parent.cpu;
   LttvProcessState *process = ts->running_process[cpu];
-  LttvAttributeValue cpu_time, cum_cpu_time;
+  LttvAttributeValue cpu_time;
 
   LttTime delta;
 
@@ -485,21 +485,20 @@ static void mode_end(LttvTracefileStats *tfcs)
   LttTime delta;
 
   /* FIXME put there in case of a missing update after a state modification */
+  //void *lasttree = tfcs->current_events_tree;
   //update_event_tree(tfcs);
-
+  //g_assert (lasttree == tfcs->current_events_tree);
   lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_ELAPSED_TIME, 
       LTTV_TIME, &elapsed_time);
 
-  if(process->state->t != LTTV_STATE_MODE_UNKNOWN)
+  if(process->state->t != LTTV_STATE_MODE_UNKNOWN) {
     delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
         process->state->entry);
-  else
+  } else
     delta = ltt_time_zero;
 
   *(elapsed_time.v_time) = ltt_time_add(*(elapsed_time.v_time), delta);
 
-  //g_assert(delta.tv_nsec != 14736);
-
   lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME, 
       LTTV_TIME, &cpu_time);
 
@@ -527,7 +526,6 @@ 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;
 
@@ -554,7 +552,7 @@ static gboolean after_syscall_entry(void *hook_data, void *call_data)
 }
 
 
-gboolean before_syscall_exit(void *hook_data, void *call_data)
+static gboolean before_syscall_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
@@ -568,7 +566,7 @@ static gboolean after_syscall_exit(void *hook_data, void *call_data)
 }
 
 
-gboolean before_trap_entry(void *hook_data, void *call_data)
+static gboolean before_trap_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
@@ -582,115 +580,112 @@ static gboolean after_trap_entry(void *hook_data, void *call_data)
 }
 
 
-gboolean before_trap_exit(void *hook_data, void *call_data)
+static gboolean before_trap_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean after_trap_exit(void *hook_data, void *call_data)
+static gboolean after_trap_exit(void *hook_data, void *call_data)
 {
   after_mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_irq_entry(void *hook_data, void *call_data)
+static gboolean before_irq_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean after_irq_entry(void *hook_data, void *call_data)
+static gboolean after_irq_entry(void *hook_data, void *call_data)
 {
   update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_irq_exit(void *hook_data, void *call_data)
+static gboolean before_irq_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean after_irq_exit(void *hook_data, void *call_data)
+static gboolean after_irq_exit(void *hook_data, void *call_data)
 {
   after_mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean before_soft_irq_entry(void *hook_data, void *call_data)
+static gboolean before_soft_irq_entry(void *hook_data, void *call_data)
 {
   mode_change((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean after_soft_irq_entry(void *hook_data, void *call_data)
+static gboolean after_soft_irq_entry(void *hook_data, void *call_data)
 {
   update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-
-gboolean before_soft_irq_exit(void *hook_data, void *call_data)
+static gboolean before_soft_irq_exit(void *hook_data, void *call_data)
 {
   mode_end((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
 
-gboolean after_soft_irq_exit(void *hook_data, void *call_data)
+static 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)
+static 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)
+static 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)
+static 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)
+static 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)
+static 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;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
 
   guint pid_in, pid_out;
     
-  gint state_out;
+  gint64 state_out;
 
-  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);
+  pid_out = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
+  pid_in = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
+  state_out = ltt_event_get_long_int(e, lttv_trace_get_hook_field(th, 2));
 
   /* compute the time for the process to schedule out */
   mode_change(tfcs);
@@ -698,7 +693,7 @@ gboolean before_schedchange(void *hook_data, void *call_data)
   return FALSE;
 }
 
-gboolean after_schedchange(void *hook_data, void *call_data)
+static gboolean after_schedchange(void *hook_data, void *call_data)
 {
   LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
@@ -706,17 +701,17 @@ gboolean after_schedchange(void *hook_data, void *call_data)
 
   LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf);
 
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
 
   guint pid_in, pid_out;
     
-  gint state_out;
+  gint64 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);
+  pid_out = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
+  pid_in = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
+  state_out = ltt_event_get_long_int(e, lttv_trace_get_hook_field(th, 2));
 
   /* get the information for the process scheduled in */
   guint cpu = tfcs->parent.cpu;
@@ -734,21 +729,18 @@ gboolean after_schedchange(void *hook_data, void *call_data)
   return FALSE;
 }
 
-gboolean process_fork(void *hook_data, void *call_data)
+static gboolean process_fork(void *hook_data, void *call_data)
 {
-  /* nothing to do for now */
   return FALSE;
 }
 
-
-gboolean process_exit(void *hook_data, void *call_data)
+static gboolean process_exit(void *hook_data, void *call_data)
 {
-  /* We should probably exit all modes here or we could do that at 
-     schedule out. */
+  update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
-gboolean before_enum_process_state(void *hook_data, void *call_data)
+static gboolean before_enum_process_state(void *hook_data, void *call_data)
 {
 #if 0
   /* Broken : adds up time in the current process doing the dump */
@@ -760,40 +752,28 @@ gboolean before_enum_process_state(void *hook_data, void *call_data)
   return FALSE;
 }
 
-gboolean after_enum_process_state(void *hook_data, void *call_data)
+static gboolean after_enum_process_state(void *hook_data, void *call_data)
 {
-  LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
-  LttvTraceState *ts = (LttvTraceState*)tfc->t_context;
-  guint nb_cpus, i;
-
-  nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
-  for(i=0; i<nb_cpus; i++) {
-    update_trace_event_tree(tfcs, i);
-  }
+  LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context;
+  update_trace_event_tree(tcs);
   return FALSE;
 }
 
 static gboolean after_statedump_end(void *hook_data, void *call_data)
 {
-  LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
-  LttvTraceState *ts = (LttvTraceState*)tfc->t_context;
-  guint nb_cpus, i;
-
-  nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
-  for(i=0; i<nb_cpus; i++) {
-    update_trace_event_tree(tfcs, i);
-  }
+  LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context;
+  update_trace_event_tree(tcs);
   return FALSE;
 }
 
-gboolean process_free(void *hook_data, void *call_data)
+static gboolean process_free(void *hook_data, void *call_data)
 {
   return FALSE;
 }
 
-gboolean every_event(void *hook_data, void *call_data)
+static gboolean every_event(void *hook_data, void *call_data)
 {
   LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
@@ -801,34 +781,49 @@ gboolean every_event(void *hook_data, void *call_data)
 
   LttvAttributeValue v;
 
+  LttTrace *trace = ((LttvTracefileContext *)tfcs)->t_context->t;
+
+  struct marker_info *info;
+
   /* The current branch corresponds to the tracefile/process/interrupt state.
      Statistics are added within it, to count the number of events of this
      type occuring in this context. A quark has been pre-allocated for each
      event type and is used as name. */
 
+  info = marker_get_info_from_id(trace, e->event_id);
+
   lttv_attribute_find(tfcs->current_event_types_tree, 
-      ltt_eventtype_name(ltt_event_eventtype(e)), 
-      LTTV_UINT, &v);
+      info->name, LTTV_UINT, &v);
   (*(v.v_uint))++;
   return FALSE;
 }
 
-static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
-  LttvProcessState *process)
+struct cleanup_state_struct {
+  LttvTraceState *ts;
+  LttTime current_time;
+};
+
+//static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
+//  LttvProcessState *process, LttTime current_time)
+static void lttv_stats_cleanup_process_state(gpointer key, gpointer value,
+  gpointer user_data)
 {
-  LttvTraceStats *tcs = (LttvTraceStats *)ts;
-  LttvTracesetContext *tsc = ts->parent.ts_context;
-  int i;
+  struct cleanup_state_struct *cleanup_closure =
+    (struct cleanup_state_struct *)user_data;
+  LttvTraceState *ts = cleanup_closure->ts;
+  LttvProcessState *process = (LttvProcessState *)value;
+  LttTime current_time = cleanup_closure->current_time;
   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;
+  //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) {
@@ -837,7 +832,9 @@ static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
           process->current_function,
           process->state->t, process->state->n, &((*tfs)->current_events_tree), 
           &((*tfs)->current_event_types_tree));
-      mode_end(*tfs);
+      /* Call mode_end only if not at end of trace */
+      if(ltt_time_compare(current_time, ltt_time_infinite) != 0)
+        mode_end(*tfs);
       nested_delta = process->state->cum_cpu_time;
     }
     cleanup_empty = lttv_state_pop_state_cleanup(process,
@@ -847,25 +844,33 @@ static void lttv_stats_cleanup_process_state(LttvTraceState *ts,
 
   } while(cleanup_empty != 1);
 
-  (*tfs)->parent.parent.timestamp = save_time;
+  //(*tfs)->parent.parent.timestamp = save_time;
 }
 
 /* For each cpu, for each of their stacked states,
  * perform sum of needed values. */
-static void lttv_stats_cleanup_state(LttvTraceStats *tcs)
+static void lttv_stats_cleanup_state(LttvTraceStats *tcs, LttTime current_time)
 {
   LttvTraceState *ts = (LttvTraceState *)tcs;
+  struct cleanup_state_struct cleanup_closure;
+#if 0
   guint nb_cpus, i;
 
   nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
   
   for(i=0; i<nb_cpus; i++) {
-    lttv_stats_cleanup_process_state(ts, ts->running_process[i]);
+    lttv_stats_cleanup_process_state(ts, ts->running_process[i], current_time);
   }
+#endif //0
+  cleanup_closure.ts = ts;
+  cleanup_closure.current_time = current_time;
+  g_hash_table_foreach(ts->processes, lttv_stats_cleanup_process_state,
+    &cleanup_closure);
 }
 
 void
-lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
+lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats,
+  LttTime current_time)
 {
   LttvAttribute *sum_container = self->stats;
 
@@ -904,7 +909,7 @@ lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
   /* First cleanup the state : sum all stalled information (never ending
    * states). */
   if(!trace_is_summed)
-    lttv_stats_cleanup_state(self);
+    lttv_stats_cleanup_state(self, current_time);
   
   processes_tree = lttv_attribute_find_subdir(main_tree, 
                                               LTTV_STATS_PROCESSES);
@@ -994,12 +999,14 @@ lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats)
 
 gboolean lttv_stats_sum_traceset_hook(void *hook_data, void *call_data)
 {
-  lttv_stats_sum_traceset((LttvTracesetStats *)call_data);
+  struct sum_traceset_closure *closure =
+    (struct sum_traceset_closure *)call_data;
+  lttv_stats_sum_traceset(closure->tss, closure->current_time);
   return 0;
 }
 
 void
-lttv_stats_sum_traceset(LttvTracesetStats *self)
+lttv_stats_sum_traceset(LttvTracesetStats *self, LttTime current_time)
 {
   LttvTraceset *traceset = self->parent.parent.ts;
   LttvAttribute *sum_container = self->stats;
@@ -1008,8 +1015,6 @@ lttv_stats_sum_traceset(LttvTracesetStats *self)
 
   int i, nb_trace;
 
-  LttvAttribute *main_tree;
-
   LttvAttributeValue value;
 
   lttv_attribute_find(sum_container, LTTV_STATS_SUMMED, 
@@ -1021,7 +1026,7 @@ lttv_stats_sum_traceset(LttvTracesetStats *self)
 
   for(i = 0 ; i < nb_trace ; i++) {
     tcs = (LttvTraceStats *)(self->parent.parent.traces[i]);
-    lttv_stats_sum_trace(tcs, self->stats);
+    lttv_stats_sum_trace(tcs, self->stats, current_time);
   //        lttv_attribute_recursive_add(sum_container, tcs->stats);
   }
 }
@@ -1041,7 +1046,7 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
 {
   LttvTraceset *traceset = self->parent.parent.ts;
 
-  guint i, j, k, l, nb_trace, nb_tracefile;
+  guint i, j, k, nb_trace, nb_tracefile;
 
   LttvTraceStats *ts;
 
@@ -1049,15 +1054,10 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
 
   GArray *hooks, *before_hooks, *after_hooks;
 
-  LttvTraceHook *hook;
-
-  LttvTraceHookByFacility *thf;
+  LttvTraceHook *th;
 
   LttvAttributeValue val;
 
-  gint ret;
-  gint hn;
-
   nb_trace = lttv_traceset_number(traceset);
   for(i = 0 ; i < nb_trace ; i++) {
     ts = (LttvTraceStats *)self->parent.parent.traces[i];
@@ -1066,216 +1066,208 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
        associated by id hooks. */
 
     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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_SYSCALL_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
         before_syscall_entry, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_SYSCALL_EXIT,
+        NULL,
         before_syscall_exit, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
-        LTT_FIELD_TRAP_ID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_TRAP_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_TRAP_ID),
         before_trap_entry, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_TRAP_EXIT,
+        NULL,
         before_trap_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
-        LTT_FIELD_IRQ_ID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_IRQ_ID),
         before_irq_entry, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_EXIT,
+        NULL,
         before_irq_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
-        LTT_FIELD_SOFT_IRQ_ID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SOFT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
         before_soft_irq_entry, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SOFT_IRQ_EXIT,
+        NULL,
         before_soft_irq_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SCHED_SCHEDULE,
+        FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
         before_schedchange, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_FUNCTION_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
         before_function_entry, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_FUNCTION_EXIT,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
         before_function_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
     /* 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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_LIST,
+        LTT_EVENT_PROCESS_STATE,
+        FIELD_ARRAY(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);
+        &hooks);
 
     before_hooks = hooks;
 
     hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 16);
-    g_array_set_size(hooks, 16);
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_SYSCALL_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
         after_syscall_entry, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_SYSCALL_EXIT,
+        NULL,
         after_syscall_exit, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, 
-        LTT_FIELD_TRAP_ID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_TRAP_ENTRY, 
+        FIELD_ARRAY(LTT_FIELD_TRAP_ID),
         after_trap_entry, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_TRAP_EXIT,
+        NULL,
         after_trap_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY, 
-        LTT_FIELD_IRQ_ID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_ENTRY, 
+        FIELD_ARRAY(LTT_FIELD_IRQ_ID),
         after_irq_entry, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_EXIT,
+        NULL,
         after_irq_exit, NULL,
-        &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, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
-        0, 0, 0,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SOFT_IRQ_ENTRY, 
+        FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
+        after_soft_irq_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SOFT_IRQ_EXIT,
+        NULL,
         after_soft_irq_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SCHED_SCHEDULE,
+        FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
         after_schedchange, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_FORK, 
-        LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_PROCESS_FORK, 
+        FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
         process_fork, NULL, 
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
-        LTT_FIELD_PID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_PROCESS_EXIT,
+        FIELD_ARRAY(LTT_FIELD_PID),
         process_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
     
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_PROCESS, LTT_EVENT_FREE,
-        LTT_FIELD_PID, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_PROCESS_FREE,
+        FIELD_ARRAY(LTT_FIELD_PID),
         process_free, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_FUNCTION_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
         after_function_entry, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_FUNCTION_EXIT,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
         after_function_exit, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
     /* 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,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_LIST,
+        LTT_EVENT_PROCESS_STATE,
+        FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),
         after_enum_process_state, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+        &hooks);
 
-    ret = lttv_trace_find_hook(ts->parent.parent.t,
-        LTT_FACILITY_STATEDUMP, LTT_EVENT_STATEDUMP_END,
-        0, 0, 0,
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_FACILITY_LIST,
+        LTT_EVENT_STATEDUMP_END,
+        NULL,
         after_statedump_end, NULL,
-        &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    g_array_set_size(hooks, hn);
+        &hooks);
 
     after_hooks = hooks;
 
@@ -1290,26 +1282,20 @@ void lttv_stats_add_event_hooks(LttvTracesetStats *self)
                      LTTV_PRIO_DEFAULT);
 
       for(k = 0 ; k < before_hooks->len ; 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);
-        }
+        th = &g_array_index(before_hooks, LttvTraceHook, k);
+        lttv_hooks_add(
+            lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id),
+            th->h,
+            th,
+            LTTV_PRIO_STATS_BEFORE_STATE);
       }
       for(k = 0 ; k < after_hooks->len ; 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);
-        }
+        th = &g_array_index(after_hooks, LttvTraceHook, k);
+        lttv_hooks_add(
+            lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id),
+            th->h,
+            th,
+            LTTV_PRIO_STATS_AFTER_STATE);
       }
     }
     lttv_attribute_find(self->parent.parent.a, LTTV_STATS_BEFORE_HOOKS, 
@@ -1335,19 +1321,15 @@ void lttv_stats_remove_event_hooks(LttvTracesetStats *self)
 {
   LttvTraceset *traceset = self->parent.parent.ts;
 
-  guint i, j, k, l, nb_trace, nb_tracefile;
+  guint i, j, k, nb_trace, nb_tracefile;
 
   LttvTraceStats *ts;
 
   LttvTracefileStats *tfs;
 
-  void *hook_data;
-
   GArray *before_hooks, *after_hooks;
 
-  LttvTraceHook *hook;
-  
-  LttvTraceHookByFacility *thf;
+  LttvTraceHook *th;
 
   LttvAttributeValue val;
 
@@ -1372,27 +1354,24 @@ void lttv_stats_remove_event_hooks(LttvTracesetStats *self)
           NULL);
 
       for(k = 0 ; k < before_hooks->len ; 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);
-        }
+        th = &g_array_index(before_hooks, LttvTraceHook, k);
+        lttv_hooks_remove_data(
+            lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id),
+            th->h,
+            th);
       }
       for(k = 0 ; k < after_hooks->len ; 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);
-        }
+        th = &g_array_index(after_hooks, LttvTraceHook, k);
+        lttv_hooks_remove_data(
+            lttv_hooks_by_id_find(tfs->parent.parent.event_by_id, th->id),
+            th->h,
+            th);
+        
       }
     }
     g_debug("lttv_stats_remove_event_hooks()");
+    lttv_trace_hook_remove_all(&before_hooks);
+    lttv_trace_hook_remove_all(&after_hooks);
     g_array_free(before_hooks, TRUE);
     g_array_free(after_hooks, TRUE);
   }