X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstats.c;h=e34bab22e34f9a618e7202d3d233c01f1204735c;hb=6800387420c3586d678b481111c58896423eff04;hp=00e8811004dfda3f594e35ad19afeededd227e76;hpb=327a43149d62f1984112e1ef022ef039897f78ad;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/stats.c b/ltt/branches/poly/lttv/lttv/stats.c
index 00e88110..e34bab22 100644
--- a/ltt/branches/poly/lttv/lttv/stats.c
+++ b/ltt/branches/poly/lttv/lttv/stats.c
@@ -25,11 +25,11 @@
 #include <lttv/stats.h>
 #include <lttv/lttv.h>
 #include <lttv/attribute.h>
-#include <ltt/facility.h>
 #include <ltt/trace.h>
 #include <ltt/event.h>
 
 #define BUF_SIZE 256
+#define MAX_64_HEX_STRING_LEN 19
 
 GQuark
   LTTV_STATS_PROCESS_UNKNOWN,
@@ -38,27 +38,28 @@ GQuark
   LTTV_STATS_MODE_TYPES,
   LTTV_STATS_MODES,
   LTTV_STATS_SUBMODES,
+  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_USE_COUNT,
   LTTV_STATS,
   LTTV_STATS_TRACEFILES,
-  LTTV_STATS_SUMMED;
-
-static GQuark
+  LTTV_STATS_SUMMED,
   LTTV_STATS_BEFORE_HOOKS,
   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);
 
-static void
-init(LttvTracesetStats *self, LttvTraceset *ts)
+
+static void lttv_stats_init(LttvTracesetStats *self)
 {
   guint i, j, nb_trace, nb_tracefile;
 
@@ -66,21 +67,14 @@ init(LttvTracesetStats *self, LttvTraceset *ts)
 
   LttvTraceStats *tcs;
 
-  LttvTracefileContext *tfc;
-
   LttvTracefileContext **tfs;
   LttvTracefileStats *tfcs;
   
-  LttTime timestamp = {0,0};
-
   LttvAttributeValue v;
 
-  LttvAttribute
-    *stats_tree,
-    *tracefiles_stats;
+  LttvAttribute *tracefiles_stats;
 
-  LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))->
-      init((LttvTracesetContext *)self, ts);
+  LttvTraceset *ts = self->parent.parent.ts;
 
   self->stats = lttv_attribute_find_subdir(
                       lttv_traceset_attribute(self->parent.parent.ts),
@@ -89,7 +83,7 @@ init(LttvTracesetStats *self, LttvTraceset *ts)
                       LTTV_STATS_USE_COUNT, 
                       LTTV_UINT, &v);
 
-  *(v.v_uint)++;
+  (*(v.v_uint))++;
   if(*(v.v_uint) == 1) { 
     g_assert(lttv_attribute_get_number(self->stats) == 0);
   }
@@ -106,7 +100,7 @@ init(LttvTracesetStats *self, LttvTraceset *ts)
     lttv_attribute_find(tcs->parent.parent.t_a, LTTV_STATS_USE_COUNT, 
         LTTV_UINT, &v);
 
-    *(v.v_uint)++;
+    (*(v.v_uint))++;
     if(*(v.v_uint) == 1) { 
       g_assert(lttv_attribute_get_number(tcs->stats) == 0);
     }
@@ -118,17 +112,20 @@ init(LttvTracesetStats *self, LttvTraceset *ts)
                       LttvTracefileContext*, j);
       tfcs = LTTV_TRACEFILE_STATS(*tfs);
       tfcs->stats = lttv_attribute_find_subdir(tracefiles_stats, 
-          tfcs->parent.cpu_name);
+          ltt_tracefile_long_name(tfcs->parent.parent.tf));
+      guint cpu = tfcs->parent.cpu;
       find_event_tree(tfcs, LTTV_STATS_PROCESS_UNKNOWN,
-          tfcs->parent.cpu_name, LTTV_STATE_MODE_UNKNOWN, 
+          cpu,
+          0x0ULL,
+          LTTV_STATE_MODE_UNKNOWN, 
           LTTV_STATE_SUBMODE_UNKNOWN, &tfcs->current_events_tree,
           &tfcs->current_event_types_tree);
     }
   }
+
 }
 
-static void
-fini(LttvTracesetStats *self)
+static void lttv_stats_fini(LttvTracesetStats *self)
 {
   guint i, j, nb_trace, nb_tracefile;
 
@@ -142,15 +139,13 @@ fini(LttvTracesetStats *self)
 
   LttvTracefileStats *tfcs;
   
-  LttTime timestamp = {0,0};
-
   LttvAttributeValue v;
 
   LttvAttribute *tracefiles_stats;
 
   lttv_attribute_find(self->parent.parent.ts_a, LTTV_STATS_USE_COUNT, 
         LTTV_UINT, &v);
-  *(v.v_uint)--;
+  (*(v.v_uint))--;
 
   if(*(v.v_uint) == 0) {
     lttv_attribute_remove_by_name(self->parent.parent.ts_a, LTTV_STATS);
@@ -165,7 +160,7 @@ fini(LttvTracesetStats *self)
 
     lttv_attribute_find(tcs->parent.parent.t_a, LTTV_STATS_USE_COUNT, 
         LTTV_UINT, &v);
-    *(v.v_uint)--;
+    (*(v.v_uint))--;
 
     if(*(v.v_uint) == 0) { 
       lttv_attribute_remove_by_name(tcs->parent.parent.t_a,LTTV_STATS);
@@ -187,6 +182,32 @@ fini(LttvTracesetStats *self)
       tfcs->current_event_types_tree = NULL;
     }
   }
+}
+
+
+void lttv_stats_reset(LttvTracesetStats *self)
+{
+  lttv_stats_fini(self);
+  lttv_stats_init(self);
+}
+
+
+
+static void
+init(LttvTracesetStats *self, LttvTraceset *ts)
+{
+  LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))->
+      init((LttvTracesetContext *)self, ts);
+  
+  lttv_stats_init(self);
+}
+
+
+static void
+fini(LttvTracesetStats *self)
+{
+  lttv_stats_fini(self);
+
   LTTV_TRACESET_CONTEXT_CLASS(g_type_class_peek(LTTV_TRACESET_STATE_TYPE))->
       fini((LttvTracesetContext *)self);
 }
@@ -362,23 +383,32 @@ lttv_tracefile_stats_get_type(void)
   return type;
 }
 
-
 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;
+  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);
@@ -388,52 +418,126 @@ find_event_tree(LttvTracefileStats *tfcs,
   *event_types_tree = a;
 }
 
-
-static void update_event_tree(LttvTracefileStats *tfcs) 
+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, 
+  guint cpu = tfcs->parent.cpu;
+  LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
+  LttvProcessState *process = ts->running_process[cpu];
+  LttvExecutionState *es = process->state;
+
+  find_event_tree(tfcs, process->pid_time,
+      cpu,
+      process->current_function,
       es->t, es->n, &(tfcs->current_events_tree), 
       &(tfcs->current_event_types_tree));
 }
 
 
+/* Update the trace event tree for the specified cpu */
+static void update_trace_event_tree(LttvTraceStats *tcs)
+{
+  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)
 {
-  LttvAttributeValue cpu_time; 
+  LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
+  guint cpu = tfcs->parent.cpu;
+  LttvProcessState *process = ts->running_process[cpu];
+  LttvAttributeValue cpu_time;
 
   LttTime delta;
 
+  if(process->state->s == LTTV_STATE_RUN &&
+      process->state->t != LTTV_STATE_MODE_UNKNOWN)
+    delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
+        process->state->change);
+  else
+    delta = ltt_time_zero;
+
   lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME, 
       LTTV_TIME, &cpu_time);
-  delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
-      tfcs->parent.process->state->change);
   *(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)
 {
-  LttvAttributeValue elapsed_time, cpu_time; 
+  LttvTraceState *ts = (LttvTraceState *)tfcs->parent.parent.t_context;
+  guint cpu = tfcs->parent.cpu;
+  LttvProcessState *process = ts->running_process[cpu];
+  LttvAttributeValue elapsed_time, cpu_time, cum_cpu_time; 
 
   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);
-  delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
-      tfcs->parent.process->state->entry);
+
+  if(process->state->t != LTTV_STATE_MODE_UNKNOWN) {
+    delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
+        process->state->entry);
+  } else
+    delta = ltt_time_zero;
+
   *(elapsed_time.v_time) = ltt_time_add(*(elapsed_time.v_time), delta);
 
   lttv_attribute_find(tfcs->current_events_tree, LTTV_STATS_CPU_TIME, 
       LTTV_TIME, &cpu_time);
-  delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
-      tfcs->parent.process->state->change);
+
+  /* if it is a running mode, we must count its cpu time */
+  if(process->state->s == LTTV_STATE_RUN &&
+      process->state->t != LTTV_STATE_MODE_UNKNOWN)
+    delta = ltt_time_sub(tfcs->parent.parent.timestamp, 
+        process->state->change);
+  else
+    delta = ltt_time_zero;
+
   *(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];
+
+  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);
@@ -448,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;
@@ -457,12 +561,12 @@ gboolean before_syscall_exit(void *hook_data, void *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 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;
@@ -476,105 +580,200 @@ 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)
 {
-  update_event_tree((LttvTracefileStats *)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;
+}
+
+
+static gboolean before_soft_irq_entry(void *hook_data, void *call_data)
+{
+  mode_change((LttvTracefileStats *)call_data);
+  return FALSE;
+}
+
+static gboolean after_soft_irq_entry(void *hook_data, void *call_data)
 {
   update_event_tree((LttvTracefileStats *)call_data);
   return FALSE;
 }
 
+static gboolean before_soft_irq_exit(void *hook_data, void *call_data)
+{
+  mode_end((LttvTracefileStats *)call_data);
+  return FALSE;
+}
+
+
+static gboolean after_soft_irq_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_function_entry(void *hook_data, void *call_data)
+{
+  mode_change((LttvTracefileStats *)call_data);
+  return FALSE;
+}
+
+static gboolean after_function_entry(void *hook_data, void *call_data)
+{
+  update_event_tree((LttvTracefileStats *)call_data);
+  return FALSE;
+}
+
+static gboolean before_function_exit(void *hook_data, void *call_data)
+{
+  mode_end((LttvTracefileStats *)call_data);
+  return FALSE;
+}
+
+static gboolean after_function_exit(void *hook_data, void *call_data)
+{
+  after_mode_end((LttvTracefileStats *)call_data);
+  return FALSE;
+}
+
+
+static gboolean before_schedchange(void *hook_data, void *call_data)
 {
   LttvTracefileStats *tfcs = (LttvTracefileStats *)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));
 
   /* compute the time for the process to schedule out */
-
   mode_change(tfcs);
 
-  /* get the information for the process scheduled in */
+  return FALSE;
+}
+
+static gboolean after_schedchange(void *hook_data, void *call_data)
+{
+  LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
 
-  process = lttv_state_find_process_or_create(&(tfcs->parent), pid_in);
+  LttvTraceState *ts = (LttvTraceState*)tfcs->parent.parent.t_context;
 
-  find_event_tree(tfcs, process->pid_time, tfcs->parent.cpu_name, 
+  LttEvent *e = ltt_tracefile_get_event(tfcs->parent.parent.tf);
+
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+
+  guint pid_in, pid_out;
+    
+  gint64 state_out;
+
+  LttvProcessState *process;
+
+  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;
+  process = ts->running_process[cpu];
+
+  find_event_tree(tfcs, process->pid_time,
+      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;
+}
+
+static gboolean process_fork(void *hook_data, void *call_data)
+{
   return FALSE;
 }
 
+static gboolean process_exit(void *hook_data, void *call_data)
+{
+  update_event_tree((LttvTracefileStats *)call_data);
+  return FALSE;
+}
 
-gboolean process_fork(void *hook_data, void *call_data)
+static gboolean before_enum_process_state(void *hook_data, void *call_data)
 {
-  /* nothing to do for now */
+#if 0
+  /* Broken : adds up time in the current process doing the dump */
+  LttvTracefileStats *tfcs = (LttvTracefileStats *)call_data;
+  mode_end(tfcs);
+  after_mode_end(tfcs);
+  mode_change(tfcs);
+#endif //0
   return FALSE;
 }
 
+static gboolean after_enum_process_state(void *hook_data, void *call_data)
+{
+  LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+  LttvTraceStats *tcs = (LttvTraceStats*)tfc->t_context;
+  update_trace_event_tree(tcs);
+  return FALSE;
+}
 
-gboolean process_exit(void *hook_data, void *call_data)
+static gboolean after_statedump_end(void *hook_data, void *call_data)
 {
-  /* We should probably exit all modes here or we could do that at 
-     schedule out. */
+  LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+  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;
 
@@ -582,21 +781,96 @@ 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;
 }
 
+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)
+{
+  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;
+
+  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));
+      /* 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,
+        (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 cpu, for each of their stacked states,
+ * perform sum of needed values. */
+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], 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)
+lttv_stats_sum_trace(LttvTraceStats *self, LttvAttribute *ts_stats,
+  LttTime current_time)
 {
   LttvAttribute *sum_container = self->stats;
 
@@ -606,98 +880,133 @@ lttv_stats_sum_trace(LttvTraceStats *self)
 
   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, current_time);
+  
   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);
+      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);
           }
-          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);
+        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(process_modes_tree, cpu_tree);
-      lttv_attribute_recursive_add(trace_cpu_tree, cpu_tree);
     }
-    lttv_attribute_recursive_add(trace_modes_tree, process_modes_tree);
   }
 }
 
 
 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;
@@ -706,8 +1015,6 @@ lttv_stats_sum_traceset(LttvTracesetStats *self)
 
   int i, nb_trace;
 
-  LttvAttribute *main_tree, *trace_modes_tree, *traceset_modes_tree;
-
   LttvAttributeValue value;
 
   lttv_attribute_find(sum_container, LTTV_STATS_SUMMED, 
@@ -715,16 +1022,12 @@ lttv_stats_sum_traceset(LttvTracesetStats *self)
   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, current_time);
+  //        lttv_attribute_recursive_add(sum_container, tcs->stats);
   }
 }
 
@@ -743,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;
 
@@ -751,13 +1054,12 @@ 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++) {
@@ -766,118 +1068,181 @@ void 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_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 7);
-    g_array_set_size(hooks, 7);
-
-    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);
-
-    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);
-
-    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));
-    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);
+    hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 12);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SYSCALL_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
+        before_syscall_entry, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SYSCALL_EXIT,
+        NULL,
+        before_syscall_exit, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_TRAP_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+        before_trap_entry, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_TRAP_EXIT,
+        NULL,
+        before_trap_exit, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_IRQ_ID),
+        before_irq_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_IRQ_EXIT,
+        NULL,
+        before_irq_exit, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SOFT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
+        before_soft_irq_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SOFT_IRQ_EXIT,
+        NULL,
+        before_soft_irq_exit, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SCHED_SCHEDULE,
+        FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
+        before_schedchange, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_FUNCTION_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+        before_function_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_FUNCTION_EXIT,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+        before_function_exit, NULL,
+        &hooks);
+
+    /* statedump-related hooks */
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_PROCESS_STATE,
+        FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),
+        before_enum_process_state, NULL,
+        &hooks);
 
     before_hooks = hooks;
 
-    hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 9);
-    g_array_set_size(hooks, 9);
-
-    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);
-
-    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));
-    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);
+    hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 16);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SYSCALL_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
+        after_syscall_entry, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SYSCALL_EXIT,
+        NULL,
+        after_syscall_exit, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_TRAP_ENTRY, 
+        FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+        after_trap_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_TRAP_EXIT,
+        NULL,
+        after_trap_exit, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_IRQ_ENTRY, 
+        FIELD_ARRAY(LTT_FIELD_IRQ_ID),
+        after_irq_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_IRQ_EXIT,
+        NULL,
+        after_irq_exit, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SOFT_IRQ_ENTRY, 
+        FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
+        after_irq_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SOFT_IRQ_EXIT,
+        NULL,
+        after_soft_irq_exit, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_SCHED_SCHEDULE,
+        FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
+        after_schedchange, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_PROCESS_FORK, 
+        FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
+        process_fork, NULL, 
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_PROCESS_EXIT,
+        FIELD_ARRAY(LTT_FIELD_PID),
+        process_exit, NULL,
+        &hooks);
     
-    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,
+        LTT_EVENT_PROCESS_FREE,
+        FIELD_ARRAY(LTT_FIELD_PID),
+        process_free, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_FUNCTION_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+        after_function_entry, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_FUNCTION_EXIT,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+        after_function_exit, NULL,
+        &hooks);
+
+    /* statedump-related hooks */
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_PROCESS_STATE,
+        FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),
+        after_enum_process_state, NULL,
+        &hooks);
+
+    lttv_trace_find_hook(ts->parent.parent.t,
+        LTT_EVENT_STATEDUMP_END,
+        NULL,
+        after_statedump_end, NULL,
+        &hooks);
 
     after_hooks = hooks;
 
@@ -892,26 +1257,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, 
@@ -937,19 +1296,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;
 
@@ -974,27 +1329,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);
   }
@@ -1009,9 +1361,11 @@ static void module_init()
   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_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");