update compat
[lttv.git] / ltt / branches / poly / lttv / lttv / state.c
index 405c6e709175f8c376f7feda0ae89c36f5a82410..952f6cde9bf866dfc8b349e17d533744b9183e65 100644 (file)
  * MA 02111-1307, USA.
  */
 
+#define _GNU_SOURCE
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
 #include <lttv/state.h>
-#include <ltt/facility.h>
 #include <ltt/trace.h>
 #include <ltt/event.h>
-#include <ltt/type.h>
+#include <ltt/ltt.h>
+#include <ltt/marker-desc.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -75,7 +77,8 @@ GQuark
     LTT_EVENT_FUNCTION_EXIT,
     LTT_EVENT_THREAD_BRAND,
     LTT_EVENT_REQUEST_ISSUE,
-    LTT_EVENT_REQUEST_COMPLETE;
+    LTT_EVENT_REQUEST_COMPLETE,
+    LTT_EVENT_LIST_INTERRUPT;
 
 /* Fields Quarks */
 
@@ -102,7 +105,8 @@ GQuark
     LTT_FIELD_CALL_SITE,
     LTT_FIELD_MINOR,
     LTT_FIELD_MAJOR,
-    LTT_FIELD_OPERATION;
+    LTT_FIELD_OPERATION,
+    LTT_FIELD_ACTION;
 
 LttvExecutionMode
   LTTV_STATE_MODE_UNKNOWN,
@@ -164,6 +168,7 @@ static GQuark
   LTTV_STATE_NAME_TABLES,
   LTTV_STATE_TRACE_STATE_USE_COUNT,
   LTTV_STATE_RESOURCE_CPUS,
+  LTTV_STATE_RESOURCE_CPUS_COUNT,
   LTTV_STATE_RESOURCE_IRQS,
   LTTV_STATE_RESOURCE_BLKDEVS;
 
@@ -192,7 +197,6 @@ static LttvBdevState *bdevstate_new(void);
 static void bdevstate_free(LttvBdevState *);
 static void bdevstate_free_cb(gpointer key, gpointer value, gpointer user_data);
 static LttvBdevState *bdevstate_copy(LttvBdevState *bds);
-static LttvBdevState *bdev_state_get(LttvTraceState *ts, guint16 devcode);
 
 
 void lttv_state_save(LttvTraceState *self, LttvAttribute *container)
@@ -256,7 +260,7 @@ restore_init_state(LttvTraceState *self)
 {
   guint i, nb_cpus, nb_irqs;
 
-  LttvTracefileState *tfcs;
+  //LttvTracefileState *tfcs;
 
   LttTime start_time, end_time;
   
@@ -354,7 +358,7 @@ state_load_saved_states(LttvTraceState *tcs)
 {
   FILE *fp;
   GPtrArray *quarktable;
-  char *trace_path;
+  const char *trace_path;
   char path[PATH_MAX];
   guint count;
   guint i;
@@ -519,7 +523,7 @@ fini(LttvTracesetState *self)
 
   LttvTraceState *tcs;
 
-  LttvTracefileState *tfcs;
+  //LttvTracefileState *tfcs;
 
   LttvAttributeValue v;
 
@@ -607,7 +611,7 @@ static void write_process_state(gpointer key, gpointer value,
   }
 
   for(i = 0 ; i < process->user_stack->len; i++) {
-    address = &g_array_index(process->user_stack, guint64, i);
+    address = g_array_index(process->user_stack, guint64, i);
     fprintf(fp, "    <USER_STACK ADDRESS=\"%llu\"/>\n",
             address);
   }
@@ -742,7 +746,7 @@ static void write_process_state_raw(gpointer key, gpointer value,
   }
 
   for(i = 0 ; i < process->user_stack->len; i++) {
-    address = &g_array_index(process->user_stack, guint64, i);
+    address = g_array_index(process->user_stack, guint64, i);
     fputc(HDR_USER_STACK, fp);
     fwrite(&address, sizeof(address), 1, fp);
 #if 0
@@ -838,9 +842,7 @@ static void read_process_state_raw(LttvTraceState *self, FILE *fp,
   LttvProcessState tmp;
   GQuark tmpq;
 
-  guint i;
   guint64 *address;
-  guint cpu;
 
   /* TODO : check return value */
   fread(&tmp.type, sizeof(tmp.type), 1, fp);
@@ -1077,7 +1079,7 @@ void lttv_trace_states_read_raw(LttvTraceState *tcs, FILE *fp,
 end_loop:
   *(tcs->max_time_state_recomputed_in_seek) = tcs->parent.time_span.end_time;
   restore_init_state(tcs);
-  lttv_process_trace_seek_time(tcs, ltt_time_zero);
+  lttv_process_trace_seek_time(&tcs->parent, ltt_time_zero);
   return;
 }
 
@@ -1153,7 +1155,7 @@ static void lttv_state_free_cpu_states(LttvCPUState *states, guint n)
   guint i;
 
   for(i=0; i<n; i++) {
-    g_array_free(states[i].mode_stack, FALSE);
+    g_array_free(states[i].mode_stack, TRUE);
   }
 
   g_free(states);
@@ -1182,7 +1184,7 @@ static void lttv_state_free_irq_states(LttvIRQState *states, guint n)
   guint i;
 
   for(i=0; i<n; i++) {
-    g_array_free(states[i].mode_stack, FALSE);
+    g_array_free(states[i].mode_stack, TRUE);
   }
 
   g_free(states);
@@ -1213,11 +1215,13 @@ static LttvBdevState *bdevstate_new(void)
   LttvBdevState *retval;
   retval = g_malloc(sizeof(LttvBdevState));
   retval->mode_stack = g_array_new(FALSE, FALSE, sizeof(GQuark));
+
+  return retval;
 }
 
 static void bdevstate_free(LttvBdevState *bds)
 {
-  g_array_free(bds->mode_stack, FALSE);
+  g_array_free(bds->mode_stack, TRUE);
   g_free(bds);
 }
 
@@ -1234,15 +1238,17 @@ static LttvBdevState *bdevstate_copy(LttvBdevState *bds)
 
   retval = bdevstate_new();
   g_array_insert_vals(retval->mode_stack, 0, bds->mode_stack->data, bds->mode_stack->len);
+
+  return retval;
 }
 
 static void insert_and_copy_bdev_state(gpointer k, gpointer v, gpointer u)
 {
-  GHashTable *ht = (GHashTable *)u;
+  //GHashTable *ht = (GHashTable *)u;
   LttvBdevState *bds = (LttvBdevState *)v;
   LttvBdevState *newbds;
 
-  newbds = bdevstate_copy(v);
+  newbds = bdevstate_copy(bds);
 
   g_hash_table_insert(u, k, newbds);
 }
@@ -1283,12 +1289,8 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
   
   guint *running_process;
 
-  LttvAttributeType type;
-
   LttvAttributeValue value;
 
-  LttvAttributeName name;
-
   LttEventPosition *ep;
 
   tracefiles_tree = lttv_attribute_find_subdir(container, 
@@ -1350,7 +1352,10 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
 
   /* save the cpu state */
   {
-    guint size = sizeof(LttvCPUState)*nb_cpus;
+    value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_CPUS_COUNT,
+        LTTV_UINT);
+    *(value.v_uint) = nb_cpus;
+
     value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_CPUS,
         LTTV_POINTER);
     *(value.v_pointer) = lttv_state_copy_cpu_states(self->cpu_states, nb_cpus);
@@ -1359,7 +1364,6 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
   /* save the irq state */
   nb_irqs = self->nb_irqs;
   {
-    guint size = sizeof(LttvCPUState)*nb_irqs;
     value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_IRQS,
         LTTV_POINTER);
     *(value.v_pointer) = lttv_state_copy_irq_states(self->irq_states, nb_irqs);
@@ -1437,7 +1441,7 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
   type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
   g_assert(type == LTTV_POINTER);
   lttv_state_free_blkdev_hashtable(self->bdev_states);
-  self->bdev_states = lttv_state_copy_blkdev_hashtable(self->bdev_states);
+  self->bdev_states = lttv_state_copy_blkdev_hashtable(*(value.v_pointer));
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs = 
@@ -1480,7 +1484,7 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
 
 static void state_saved_free(LttvTraceState *self, LttvAttribute *container)
 {
-  guint i, nb_tracefile, nb_cpus;
+  guint i, nb_tracefile, nb_cpus, nb_irqs;
 
   LttvTracefileState *tfcs;
 
@@ -1496,8 +1500,6 @@ static void state_saved_free(LttvTraceState *self, LttvAttribute *container)
 
   gboolean is_named;
 
-  LttEventPosition *ep;
-
   tracefiles_tree = lttv_attribute_find_subdir(container, 
       LTTV_STATE_TRACEFILES);
   g_object_ref(G_OBJECT(tracefiles_tree));
@@ -1511,13 +1513,31 @@ static void state_saved_free(LttvTraceState *self, LttvAttribute *container)
   lttv_attribute_remove_by_name(container, LTTV_STATE_PROCESSES);
 
   /* Free running processes array */
-  nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
   type = lttv_attribute_get_by_name(container, LTTV_STATE_RUNNING_PROCESS, 
         &value);
   g_assert(type == LTTV_POINTER);
   running_process = *(value.v_pointer);
   g_free(running_process);
 
+  /* free cpu resource states */
+  type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_CPUS_COUNT, &value);
+  g_assert(type == LTTV_UINT);
+  nb_cpus = *value.v_uint;
+  type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_CPUS, &value);
+  g_assert(type == LTTV_POINTER);
+  lttv_state_free_cpu_states(*(value.v_pointer), nb_cpus);
+
+  /* free irq resource states */
+  nb_irqs = self->nb_irqs;
+  type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_IRQS, &value);
+  g_assert(type == LTTV_POINTER);
+  lttv_state_free_irq_states(*(value.v_pointer), nb_irqs);
+
+  /* free the blkdev states */
+  type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
+  g_assert(type == LTTV_POINTER);
+  lttv_state_free_blkdev_hashtable(*(value.v_pointer));
+
   nb_tracefile = self->parent.tracefiles->len;
 
   for(i = 0 ; i < nb_tracefile ; i++) {
@@ -1618,17 +1638,7 @@ typedef struct _LttvNameTables {
 static void 
 create_name_tables(LttvTraceState *tcs) 
 {
-  int i, nb;
-
-  GQuark f_name, e_name;
-
-  LttvTraceHook h;
-
-  LttvTraceHookByFacility *thf;
-
-  LttEventType *et;
-
-  LttType *t;
+  int i;
 
   GString *fe_name = g_string_new("");
 
@@ -1636,76 +1646,68 @@ create_name_tables(LttvTraceState *tcs)
 
   LttvAttributeValue v;
 
+  GArray *hooks;
+
   lttv_attribute_find(tcs->parent.t_a, LTTV_STATE_NAME_TABLES, 
       LTTV_POINTER, &v);
   g_assert(*(v.v_pointer) == NULL);
   *(v.v_pointer) = name_tables;
-#if 0 // Use iteration over the facilities_by_name and then list all event
-      // types of each facility
-  nb = ltt_trace_eventtype_number(tcs->parent.t);
-  name_tables->eventtype_names = g_new(GQuark, nb);
-  for(i = 0 ; i < nb ; i++) {
-    et = ltt_trace_eventtype_get(tcs->parent.t, i);
-    e_name = ltt_eventtype_name(et);
-    f_name = ltt_facility_name(ltt_eventtype_facility(et));
-    g_string_printf(fe_name, "%s.%s", f_name, e_name);
-    name_tables->eventtype_names[i] = g_quark_from_string(fe_name->str);    
-  }
-#endif //0
-  if(!lttv_trace_find_hook(tcs->parent.t,
-      LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
-      LTT_FIELD_SYSCALL_ID, 0, 0,
-      NULL, NULL, &h)) {
-    
-    thf = lttv_trace_hook_get_first(&h);
-    
-    t = ltt_field_type(thf->f1);
-    nb = ltt_type_element_number(t);
-    
-    lttv_trace_hook_destroy(&h);
 
-    name_tables->syscall_names = g_new(GQuark, nb);
-    name_tables->nb_syscalls = nb;
+  hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 1);
 
-    for(i = 0 ; i < nb ; i++) {
-      name_tables->syscall_names[i] = ltt_enum_string_get(t, i);
-      if(!name_tables->syscall_names[i]) {
-        GString *string = g_string_new("");
-        g_string_printf(string, "syscall %u", i);
-        name_tables->syscall_names[i] = g_quark_from_string(string->str);
-        g_string_free(string, TRUE);
-      }
+  if(!lttv_trace_find_hook(tcs->parent.t,
+      LTT_FACILITY_KERNEL_ARCH,
+      LTT_EVENT_SYSCALL_ENTRY,
+      FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
+      NULL, NULL, &hooks)) {
+    
+//    th = lttv_trace_hook_get_first(&th);
+//    
+//    t = ltt_field_type(lttv_trace_get_hook_field(th, 0));
+//    nb = ltt_type_element_number(t);
+//    
+//    name_tables->syscall_names = g_new(GQuark, nb);
+//    name_tables->nb_syscalls = nb;
+//
+//    for(i = 0 ; i < nb ; i++) {
+//      name_tables->syscall_names[i] = ltt_enum_string_get(t, i);
+//      if(!name_tables->syscall_names[i]) {
+//        GString *string = g_string_new("");
+//        g_string_printf(string, "syscall %u", i);
+//        name_tables->syscall_names[i] = g_quark_from_string(string->str);
+//        g_string_free(string, TRUE);
+//      }
+//    }
+
+    name_tables->nb_syscalls = 256;
+    name_tables->syscall_names = g_new(GQuark, 256);
+    for(i = 0 ; i < 256 ; i++) {
+      g_string_printf(fe_name, "syscall %d", i);
+      name_tables->syscall_names[i] = g_quark_from_string(fe_name->str);
     }
-
-    //name_tables->syscall_names = g_new(GQuark, 256);
-    //for(i = 0 ; i < 256 ; i++) {
-    //  g_string_printf(fe_name, "syscall %d", i);
-    //  name_tables->syscall_names[i] = g_quark_from_string(fe_name->str);
-    //}
   } else {
     name_tables->syscall_names = NULL;
     name_tables->nb_syscalls = 0;
   }
+  lttv_trace_hook_remove_all(&hooks);
 
-  if(!lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL_ARCH,
+  if(!lttv_trace_find_hook(tcs->parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
         LTT_EVENT_TRAP_ENTRY,
-        LTT_FIELD_TRAP_ID, 0, 0,
-        NULL, NULL, &h)) {
+        FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+        NULL, NULL, &hooks)) {
+
+//    th = lttv_trace_hook_get_first(&th);
+//
+//    t = ltt_field_type(lttv_trace_get_hook_field(th, 0));
+//    //nb = ltt_type_element_number(t);
+//
+//    name_tables->trap_names = g_new(GQuark, nb);
+//    for(i = 0 ; i < nb ; i++) {
+//      name_tables->trap_names[i] = g_quark_from_string(
+//          ltt_enum_string_get(t, i));
+//    }
 
-    thf = lttv_trace_hook_get_first(&h);
-
-    t = ltt_field_type(thf->f1);
-    //nb = ltt_type_element_number(t);
-
-    lttv_trace_hook_destroy(&h);
-
-    /*
-    name_tables->trap_names = g_new(GQuark, nb);
-    for(i = 0 ; i < nb ; i++) {
-      name_tables->trap_names[i] = g_quark_from_string(
-          ltt_enum_string_get(t, i));
-    }
-    */
     name_tables->nb_traps = 256;
     name_tables->trap_names = g_new(GQuark, 256);
     for(i = 0 ; i < 256 ; i++) {
@@ -1716,19 +1718,14 @@ create_name_tables(LttvTraceState *tcs)
     name_tables->trap_names = NULL;
     name_tables->nb_traps = 0;
   }
+  lttv_trace_hook_remove_all(&hooks);
 
   if(!lttv_trace_find_hook(tcs->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
-        LTT_FIELD_IRQ_ID, 0, 0,
-        NULL, NULL, &h)) {
-    
-    thf = lttv_trace_hook_get_first(&h);
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_IRQ_ID),
+        NULL, NULL, &hooks)) {
     
-    t = ltt_field_type(thf->f1);
-    //nb = ltt_type_element_number(t);
-
-    lttv_trace_hook_destroy(&h);
-
     /*
     name_tables->irq_names = g_new(GQuark, nb);
     for(i = 0 ; i < nb ; i++) {
@@ -1746,6 +1743,7 @@ create_name_tables(LttvTraceState *tcs)
     name_tables->nb_irqs = 0;
     name_tables->irq_names = NULL;
   }
+  lttv_trace_hook_remove_all(&hooks);
   /*
   name_tables->soft_irq_names = g_new(GQuark, nb);
   for(i = 0 ; i < nb ; i++) {
@@ -1759,7 +1757,7 @@ create_name_tables(LttvTraceState *tcs)
     g_string_printf(fe_name, "softirq %d", i);
     name_tables->soft_irq_names[i] = g_quark_from_string(fe_name->str);
   }
-
+  g_array_free(hooks, TRUE);
 
   g_string_free(fe_name, TRUE);
 }
@@ -1923,9 +1921,6 @@ static void push_state(LttvTracefileState *tfs, LttvExecutionMode t,
 int lttv_state_pop_state_cleanup(LttvProcessState *process, 
     LttvTracefileState *tfs)
 { 
-  guint cpu = tfs->cpu;
-  LttvTraceState *ts = (LttvTraceState*)tfs->parent.t_context;
-
   guint depth = process->execution_stack->len;
 
   if(depth == 1){
@@ -1997,10 +1992,10 @@ static gint search_usertrace(gconstpointer a, gconstpointer b)
     /* Get smaller keys */
     if(res->best) {
       if(ltt_time_compare(*elem_time, *res->best) < 0) {
-        res->best = elem_time;
+        res->best = (LttTime *)elem_time;
       }
     } else {
-      res->best = elem_time;
+      res->best = (LttTime *)elem_time;
     }
     return -1;
   }
@@ -2037,8 +2032,6 @@ lttv_state_create_process(LttvTraceState *tcs, LttvProcessState *parent,
 
   LttvExecutionState *es;
 
-  LttvTraceContext *tc = (LttvTraceContext*)tcs;
-
   char buffer[128];
 
   process->pid = pid;
@@ -2146,7 +2139,7 @@ lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
  * the parent waits for its child terminaison, but may also happen in special
  * cases in the child's exit : when the parent ignores its children SIGCCHLD or
  * has the flag SA_NOCLDWAIT. It can also happen when the child is part
- * of a killed thread ground, but isn't the leader.
+ * of a killed thread group, but isn't the leader.
  */
 static void exit_process(LttvTracefileState *tfs, LttvProcessState *process) 
 {
@@ -2184,8 +2177,8 @@ static gboolean syscall_entry(void *hook_data, void *call_data)
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
-  LttField *f = thf->f1;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+  struct marker_field *f = lttv_trace_get_hook_field(th, 0);
 
   LttvExecutionSubmode submode;
 
@@ -2227,8 +2220,8 @@ static gboolean trap_entry(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
-  LttField *f = thf->f1;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+  struct marker_field *f = lttv_trace_get_hook_field(th, 0);
 
   LttvExecutionSubmode submode;
 
@@ -2270,18 +2263,13 @@ static gboolean irq_entry(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  guint8 fac_id = ltt_event_facility_id(e);
-  guint8 ev_id = ltt_event_eventtype_id(e);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
- // g_assert(lttv_trace_hook_get_first((LttvTraceHook *)hook_data)->f1 != NULL);
-  g_assert(thf->f1 != NULL);
- // g_assert(thf == lttv_trace_hook_get_first((LttvTraceHook *)hook_data));
-  LttField *f = thf->f1;
+  //guint8 ev_id = ltt_event_eventtype_id(e);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+  struct marker_field *f = lttv_trace_get_hook_field(th, 0);
 
   LttvExecutionSubmode submode;
   guint64 irq = ltt_event_get_long_unsigned(e, f);
   guint64 nb_irqs = ((LttvTraceState *)(s->parent.t_context))->nb_irqs;
-  GString *string;
 
   if(irq < nb_irqs) {
     submode = ((LttvTraceState *)(s->parent.t_context))->irq_names[irq];
@@ -2336,18 +2324,13 @@ static gboolean soft_irq_entry(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  guint8 fac_id = ltt_event_facility_id(e);
-  guint8 ev_id = ltt_event_eventtype_id(e);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
- // g_assert(lttv_trace_hook_get_first((LttvTraceHook *)hook_data)->f1 != NULL);
-  g_assert(thf->f1 != NULL);
- // g_assert(thf == lttv_trace_hook_get_first((LttvTraceHook *)hook_data));
-  LttField *f = thf->f1;
+  //guint8 ev_id = ltt_event_eventtype_id(e);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+  struct marker_field *f = lttv_trace_get_hook_field(th, 0);
 
   LttvExecutionSubmode submode;
   guint64 softirq = ltt_event_get_long_unsigned(e, f);
   guint64 nb_softirqs = ((LttvTraceState *)(s->parent.t_context))->nb_softirqs;
-  GString *string;
 
   if(softirq < nb_softirqs) {
     submode = ((LttvTraceState *)(s->parent.t_context))->soft_irq_names[softirq];
@@ -2364,18 +2347,38 @@ static gboolean soft_irq_entry(void *hook_data, void *call_data)
   return FALSE;
 }
 
-static gboolean bdev_request_issue(void *hook_data, void *call_data)
+static gboolean enum_interrupt(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  guint8 fac_id = ltt_event_facility_id(e);
-  guint8 ev_id = ltt_event_eventtype_id(e);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  //guint8 ev_id = ltt_event_eventtype_id(e);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+
+  GQuark action = g_quark_from_string(ltt_event_get_string(e,
+    lttv_trace_get_hook_field(th, 0)));
+  guint irq = ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 1));
 
-  guint major = ltt_event_get_long_unsigned(e, thf->f1);
-  guint minor = ltt_event_get_long_unsigned(e, thf->f2);
-  guint oper = ltt_event_get_long_unsigned(e, thf->f3);
+  ts->irq_names[irq] = action;
+
+  return FALSE;
+}
+
+
+static gboolean bdev_request_issue(void *hook_data, void *call_data)
+{
+  LttvTracefileState *s = (LttvTracefileState *)call_data;
+  LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
+  LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
+  //guint8 ev_id = ltt_event_eventtype_id(e);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+
+  guint major = ltt_event_get_long_unsigned(e,
+    lttv_trace_get_hook_field(th, 0));
+  guint minor = ltt_event_get_long_unsigned(e,
+    lttv_trace_get_hook_field(th, 1));
+  guint oper = ltt_event_get_long_unsigned(e,
+    lttv_trace_get_hook_field(th, 2));
   guint16 devcode = MKDEV(major,minor);
 
   /* have we seen this block device before? */
@@ -2394,11 +2397,14 @@ static gboolean bdev_request_complete(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
-
-  guint major = ltt_event_get_long_unsigned(e, thf->f1);
-  guint minor = ltt_event_get_long_unsigned(e, thf->f2);
-  guint oper = ltt_event_get_long_unsigned(e, thf->f3);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+
+  guint major = ltt_event_get_long_unsigned(e,
+    lttv_trace_get_hook_field(th, 0));
+  guint minor = ltt_event_get_long_unsigned(e,
+    lttv_trace_get_hook_field(th, 1));
+  //guint oper = ltt_event_get_long_unsigned(e,
+  //  lttv_trace_get_hook_field(th, 2));
   guint16 devcode = MKDEV(major,minor);
 
   /* have we seen this block device before? */
@@ -2420,7 +2426,7 @@ static void push_function(LttvTracefileState *tfs, guint64 funcptr)
 
   guint depth = process->user_stack->len;
 
-  process->user_stack = 
+  process->user_stack =
     g_array_set_size(process->user_stack, depth + 1);
     
   new_func = &g_array_index(process->user_stack, guint64, depth);
@@ -2466,11 +2472,9 @@ static gboolean function_entry(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  guint8 fac_id = ltt_event_facility_id(e);
-  guint8 ev_id = ltt_event_eventtype_id(e);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
-  g_assert(thf->f1 != NULL);
-  LttField *f = thf->f1;
+  //guint8 ev_id = ltt_event_eventtype_id(e);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+  struct marker_field *f = lttv_trace_get_hook_field(th, 0);
   guint64 funcptr = ltt_event_get_long_unsigned(e, f);
 
   push_function(s, funcptr);
@@ -2481,15 +2485,11 @@ static gboolean function_exit(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  guint8 fac_id = ltt_event_facility_id(e);
-  guint8 ev_id = ltt_event_eventtype_id(e);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
-  g_assert(thf->f1 != NULL);
-  LttField *f = thf->f1;
+  //guint8 ev_id = ltt_event_eventtype_id(e);
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
+  struct marker_field *f = lttv_trace_get_hook_field(th, 0);
   guint64 funcptr = ltt_event_get_long_unsigned(e, f);
 
-  LttvExecutionSubmode submode;
-
   pop_function(s, funcptr);
   return FALSE;
 }
@@ -2500,16 +2500,16 @@ static gboolean schedchange(void *hook_data, void *call_data)
   guint cpu = s->cpu;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
-  LttvProcessState *old_process = ts->running_process[cpu];
+  //LttvProcessState *old_process = ts->running_process[cpu];
   
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   guint pid_in, pid_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_long_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));
   
   if(likely(process != NULL)) {
 
@@ -2565,9 +2565,18 @@ static gboolean schedchange(void *hook_data, void *call_data)
 
   /* update cpu status */
   if(pid_in == 0)
+    /* going to idle task */
     cpu_set_base_mode(s->cpu_state, LTTV_CPU_IDLE);
-  else
+  else {
+    /* scheduling a real task.
+     * we must be careful here:
+     * if we just schedule()'ed to a process that is
+     * in a trap, we must put the cpu in trap mode
+     */
     cpu_set_base_mode(s->cpu_state, LTTV_CPU_BUSY);
+    if(process->state->t == LTTV_STATE_TRAP)
+      cpu_push_mode(s->cpu_state, LTTV_CPU_TRAP);
+  }
 
   return FALSE;
 }
@@ -2576,26 +2585,30 @@ static gboolean process_fork(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   guint parent_pid;
   guint child_pid;  /* In the Linux Kernel, there is one PID per thread. */
   guint child_tgid;  /* tgid in the Linux kernel is the "real" POSIX PID. */
-  LttvProcessState *zombie_process;
+  //LttvProcessState *zombie_process;
   guint cpu = s->cpu;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
   LttvProcessState *child_process;
+  struct marker_field *f;
 
   /* Parent PID */
-  parent_pid = ltt_event_get_unsigned(e, thf->f1);
+  parent_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
 
   /* Child PID */
-  child_pid = ltt_event_get_unsigned(e, thf->f2);
+  child_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
   s->parent.target_pid = child_pid;
 
   /* Child TGID */
-  if(thf->f3) child_tgid = ltt_event_get_unsigned(e, thf->f3);
-  else child_tgid = 0;
+  f = lttv_trace_get_hook_field(th, 2);
+  if (likely(f))
+    child_tgid = ltt_event_get_unsigned(e, f);
+  else
+    child_tgid = 0;
 
   /* Mathieu : it seems like the process might have been scheduled in before the
    * fork, and, in a rare case, might be the current process. This might happen
@@ -2651,15 +2664,14 @@ static gboolean process_kernel_thread(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   guint pid;
-  guint cpu = s->cpu;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process;
   LttvExecutionState *es;
 
   /* PID */
-  pid = (guint)ltt_event_get_long_unsigned(e, thf->f1);
+  pid = (guint)ltt_event_get_long_unsigned(e, lttv_trace_get_hook_field(th, 0));
   s->parent.target_pid = pid;
 
   process = lttv_state_find_process_or_create(ts, ANY_CPU, pid,
@@ -2678,14 +2690,12 @@ static gboolean process_exit(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
-  LttField *f;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   guint pid;
-  guint cpu = s->cpu;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process; // = ts->running_process[cpu];
 
-  pid = ltt_event_get_unsigned(e, thf->f1);
+  pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
   s->parent.target_pid = pid;
 
   // FIXME : Add this test in the "known state" section
@@ -2703,12 +2713,12 @@ static gboolean process_free(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   guint release_pid;
   LttvProcessState *process;
 
   /* PID of the process to release */
-  release_pid = ltt_event_get_unsigned(e, thf->f1);
+  release_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
   s->parent.target_pid = release_pid;
   
   g_assert(release_pid != 0);
@@ -2750,16 +2760,18 @@ static gboolean process_exec(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   //gchar *name;
   guint cpu = s->cpu;
   LttvProcessState *process = ts->running_process[cpu];
 
 #if 0//how to use a sequence that must be transformed in a string
   /* PID of the process to release */
-  guint64 name_len = ltt_event_field_element_number(e, thf->f1);
-  //name = ltt_event_get_string(e, thf->f1);
-  LttField *child = ltt_event_field_element_select(e, thf->f1, 0);
+  guint64 name_len = ltt_event_field_element_number(e,
+    lttv_trace_get_hook_field(th, 0));
+  //name = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 0));
+  LttField *child = ltt_event_field_element_select(e,
+    lttv_trace_get_hook_field(th, 0), 0);
   gchar *name_begin = 
     (gchar*)(ltt_event_data(e)+ltt_event_field_offset(e, child));
   gchar *null_term_name = g_new(gchar, name_len+1);
@@ -2768,7 +2780,8 @@ static gboolean process_exec(void *hook_data, void *call_data)
   process->name = g_quark_from_string(null_term_name);
 #endif //0
 
-  process->name = g_quark_from_string(ltt_event_get_string(e, thf->f1));
+  process->name = g_quark_from_string(ltt_event_get_string(e,
+    lttv_trace_get_hook_field(th, 0)));
   process->brand = LTTV_STATE_UNBRANDED;
   //g_free(null_term_name);
   return FALSE;
@@ -2779,12 +2792,12 @@ static gboolean thread_brand(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   gchar *name;
   guint cpu = s->cpu;
   LttvProcessState *process = ts->running_process[cpu];
 
-  name = ltt_event_get_string(e, thf->f1);
+  name = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 0));
   process->brand = g_quark_from_string(name);
 
   return FALSE;
@@ -2796,7 +2809,6 @@ static void fix_process(gpointer key, gpointer value,
   LttvProcessState *process;
   LttvExecutionState *es;
   process = (LttvProcessState *)value;
-  LttvTracefileContext *tfc = (LttvTracefileContext *)user_data;
   LttTime *timestamp = (LttTime*)user_data;
 
   if(process->type == LTTV_STATE_KERNEL_THREAD) {
@@ -2848,14 +2860,16 @@ static gboolean statedump_end(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
-  LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  //LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
+  //LttvTraceHook *th = (LttvTraceHook *)hook_data;
   
   /* For all processes */
     /* if kernel thread, if stack[0] is unknown, set to syscall mode, wait */
     /* else, if stack[0] is unknown, set to user mode, running */
 
   g_hash_table_foreach(ts->processes, fix_process, &tfc->timestamp);
+
+  return FALSE;
 }
 
 static gboolean enum_process_state(void *hook_data, void *call_data)
@@ -2863,9 +2877,7 @@ static gboolean enum_process_state(void *hook_data, void *call_data)
   LttvTracefileState *s = (LttvTracefileState *)call_data;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
   //It's slow : optimise later by doing this before reading trace.
-  LttEventType *et = ltt_event_eventtype(e);
-  //
-  LttvTraceHookByFacility *thf = (LttvTraceHookByFacility *)hook_data;
+  LttvTraceHook *th = (LttvTraceHook *)hook_data;
   guint parent_pid;
   guint pid;
   guint tgid;
@@ -2874,46 +2886,45 @@ static gboolean enum_process_state(void *hook_data, void *call_data)
   LttvTraceState *ts = (LttvTraceState*)s->parent.t_context;
   LttvProcessState *process = ts->running_process[cpu];
   LttvProcessState *parent_process;
-  LttField *f4, *f5, *f6, *f7, *f8;
+  struct marker_field *f;
   GQuark type, mode, submode, status;
   LttvExecutionState *es;
   guint i, nb_cpus;
 
   /* PID */
-  pid = ltt_event_get_unsigned(e, thf->f1);
+  pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 0));
   s->parent.target_pid = pid;
   
   /* Parent PID */
-  parent_pid = ltt_event_get_unsigned(e, thf->f2);
+  parent_pid = ltt_event_get_unsigned(e, lttv_trace_get_hook_field(th, 1));
 
   /* Command name */
-  command = ltt_event_get_string(e, thf->f3);
+  command = ltt_event_get_string(e, lttv_trace_get_hook_field(th, 2));
 
   /* type */
-  f4 = ltt_eventtype_field_by_name(et, LTT_FIELD_TYPE);
-  type = ltt_enum_string_get(ltt_field_type(f4),
-      ltt_event_get_unsigned(e, f4));
+  f = lttv_trace_get_hook_field(th, 3);
+  type = ltt_enum_string_get(f, ltt_event_get_unsigned(e, f));
+
+  //FIXME: type is rarely used, enum must match possible types.
 
   /* mode */
-  f5 = ltt_eventtype_field_by_name(et, LTT_FIELD_MODE);
-  mode = ltt_enum_string_get(ltt_field_type(f5), 
-      ltt_event_get_unsigned(e, f5));
+  f = lttv_trace_get_hook_field(th, 4);
+  mode = ltt_enum_string_get(f,ltt_event_get_unsigned(e, f));
 
   /* submode */
-  f6 = ltt_eventtype_field_by_name(et, LTT_FIELD_SUBMODE);
-  submode = ltt_enum_string_get(ltt_field_type(f6), 
-      ltt_event_get_unsigned(e, f6));
+  f = lttv_trace_get_hook_field(th, 5);
+  submode = ltt_enum_string_get(f, ltt_event_get_unsigned(e, f));
 
   /* status */
-  f7 = ltt_eventtype_field_by_name(et, LTT_FIELD_STATUS);
-  status = ltt_enum_string_get(ltt_field_type(f7), 
-      ltt_event_get_unsigned(e, f7));
+  f = lttv_trace_get_hook_field(th, 6);
+  status = ltt_enum_string_get(f, ltt_event_get_unsigned(e, f));
 
   /* TGID */
-  f8 = ltt_eventtype_field_by_name(et, LTT_FIELD_TGID);
-  if(f8) tgid = ltt_event_get_unsigned(e, f8);
-  else tgid = 0;
-
+  f = lttv_trace_get_hook_field(th, 7);
+  if(f)
+    tgid = ltt_event_get_unsigned(e, f);
+  else
+    tgid = 0;
 
   if(pid == 0) {
     nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
@@ -3037,7 +3048,7 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
 {
   LttvTraceset *traceset = self->parent.ts;
 
-  guint i, j, k, l, nb_trace, nb_tracefile;
+  guint i, j, k, nb_trace, nb_tracefile;
 
   LttvTraceState *ts;
 
@@ -3045,15 +3056,10 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
 
   GArray *hooks;
 
-  LttvTraceHookByFacility *thf;
+  LttvTraceHook *th;
   
-  LttvTraceHook *hook;
-
   LttvAttributeValue val;
 
-  gint ret;
-  gint hn;
-
   nb_trace = lttv_traceset_number(traceset);
   for(i = 0 ; i < nb_trace ; i++) {
     ts = (LttvTraceState *)self->parent.traces[i];
@@ -3062,139 +3068,146 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
        associated by id hooks. */
 
     hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 19);
-    hooks = g_array_set_size(hooks, 19); // Max possible number of hooks.
-    hn = 0;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
-        LTT_FIELD_SYSCALL_ID, 0, 0,
-        syscall_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
-        0, 0, 0,
-        syscall_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY,
-        LTT_FIELD_TRAP_ID, 0, 0,
-        trap_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT,
-        0, 0, 0, 
-        trap_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
-        LTT_FIELD_IRQ_ID, 0, 0,
-        irq_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
-        0, 0, 0, 
-        irq_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
-        LTT_FIELD_SOFT_IRQ_ID, 0, 0,
-        soft_irq_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
-        0, 0, 0, 
-        soft_irq_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE,
-        LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE,
-        schedchange, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK,
-        LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, LTT_FIELD_CHILD_TGID,
-        process_fork, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_KTHREAD_CREATE,
-        LTT_FIELD_PID, 0, 0,
-        process_kernel_thread, NULL, &g_array_index(hooks, LttvTraceHook,
-          hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT,
-        LTT_FIELD_PID, 0, 0,
-        process_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+    //hooks = g_array_set_size(hooks, 19); // Max possible number of hooks.
+    //hn = 0;
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_SYSCALL_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
+       syscall_entry, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_SYSCALL_EXIT,
+        NULL,
+        syscall_exit, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_TRAP_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+        trap_entry, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_TRAP_EXIT,
+        NULL,
+        trap_exit, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_IRQ_ID),
+        irq_entry, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_IRQ_EXIT,
+        NULL,
+        irq_exit, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SOFT_IRQ_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
+        soft_irq_entry, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SOFT_IRQ_EXIT,
+        NULL,
+        soft_irq_exit, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_SCHED_SCHEDULE,
+        FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID,
+         LTT_FIELD_PREV_STATE),
+        schedchange, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_PROCESS_FORK,
+        FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID,
+         LTT_FIELD_CHILD_TGID),
+        process_fork, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL_ARCH,
+        LTT_EVENT_KTHREAD_CREATE,
+        FIELD_ARRAY(LTT_FIELD_PID),
+        process_kernel_thread, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_PROCESS_EXIT,
+        FIELD_ARRAY(LTT_FIELD_PID),
+        process_exit, NULL, &hooks);
     
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE,
-        LTT_FIELD_PID, 0, 0,
-        process_free, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_FS, LTT_EVENT_EXEC,
-        LTT_FIELD_FILENAME, 0, 0,
-        process_exec, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_USER_GENERIC, LTT_EVENT_THREAD_BRAND,
-        LTT_FIELD_NAME, 0, 0,
-        thread_brand, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_KERNEL,
+        LTT_EVENT_PROCESS_FREE,
+        FIELD_ARRAY(LTT_FIELD_PID),
+        process_free, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_FS,
+        LTT_EVENT_EXEC,
+        FIELD_ARRAY(LTT_FIELD_FILENAME),
+        process_exec, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_THREAD_BRAND,
+        FIELD_ARRAY(LTT_FIELD_NAME),
+        thread_brand, NULL, &hooks);
 
      /* statedump-related hooks */
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE,
-        LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
-        enum_process_state, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END,
-        0, 0, 0,
-        statedump_end, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_BLOCK, LTT_EVENT_REQUEST_ISSUE,
-        LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION,
-        bdev_request_issue, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_BLOCK, LTT_EVENT_REQUEST_COMPLETE,
-        LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION,
-        bdev_request_complete, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_ENTRY,
-        LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0,
-        function_entry, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    ret = lttv_trace_find_hook(ts->parent.t,
-        LTT_FACILITY_USER_GENERIC, LTT_EVENT_FUNCTION_EXIT,
-        LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE, 0,
-        function_exit, NULL, &g_array_index(hooks, LttvTraceHook, hn++));
-    if(ret) hn--;
-
-    hooks = g_array_set_size(hooks, hn);
-  
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_LIST,
+        LTT_EVENT_PROCESS_STATE,
+        FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
+         LTT_FIELD_TYPE, LTT_FIELD_MODE, LTT_FIELD_SUBMODE,
+         LTT_FIELD_STATUS, LTT_FIELD_TGID),
+        enum_process_state, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_LIST,
+        LTT_EVENT_STATEDUMP_END,
+        NULL,
+        statedump_end, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_LIST,
+        LTT_EVENT_LIST_INTERRUPT,
+        FIELD_ARRAY(LTT_FIELD_ACTION, LTT_FIELD_IRQ_ID),
+        enum_interrupt, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_BLOCK,
+        LTT_EVENT_REQUEST_ISSUE,
+        FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
+        bdev_request_issue, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_BLOCK,
+        LTT_EVENT_REQUEST_COMPLETE,
+        FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
+        bdev_request_complete, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_FUNCTION_ENTRY,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+        function_entry, NULL, &hooks);
+
+    lttv_trace_find_hook(ts->parent.t,
+        LTT_FACILITY_USER_GENERIC,
+        LTT_EVENT_FUNCTION_EXIT,
+        FIELD_ARRAY(LTT_FIELD_THIS_FN, LTT_FIELD_CALL_SITE),
+        function_exit, NULL, &hooks);
+
     /* Add these hooks to each event_by_id hooks list */
 
     nb_tracefile = ts->parent.tracefiles->len;
@@ -3205,15 +3218,12 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
                                           LttvTracefileContext*, j));
 
       for(k = 0 ; k < hooks->len ; k++) {
-        hook = &g_array_index(hooks, LttvTraceHook, k);
-        for(l=0;l<hook->fac_list->len;l++) {
-          thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
+        th = &g_array_index(hooks, LttvTraceHook, k);
           lttv_hooks_add(
-            lttv_hooks_by_id_find(tfs->parent.event_by_id, thf->id),
-            thf->h,
-            thf,
+            lttv_hooks_by_id_find(tfs->parent.event_by_id, th->id),
+            th->h,
+            th,
             LTTV_PRIO_STATE);
-        }
       }
     }
     lttv_attribute_find(ts->parent.a, LTTV_STATE_HOOKS, LTTV_POINTER, &val);
@@ -3234,7 +3244,7 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self)
 {
   LttvTraceset *traceset = self->parent.ts;
 
-  guint i, j, k, l, nb_trace, nb_tracefile;
+  guint i, j, k, nb_trace, nb_tracefile;
 
   LttvTraceState *ts;
 
@@ -3242,9 +3252,7 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self)
 
   GArray *hooks;
 
-  LttvTraceHook *hook;
-  
-  LttvTraceHookByFacility *thf;
+  LttvTraceHook *th;
 
   LttvAttributeValue val;
 
@@ -3265,19 +3273,14 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self)
                                           LttvTracefileContext*, j));
 
       for(k = 0 ; k < hooks->len ; k++) {
-        hook = &g_array_index(hooks, LttvTraceHook, k);
-        for(l=0;l<hook->fac_list->len;l++) {
-          thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
-          
+        th = &g_array_index(hooks, LttvTraceHook, k);
           lttv_hooks_remove_data(
-            lttv_hooks_by_id_find(tfs->parent.event_by_id, thf->id),
-                    thf->h,
-                    thf);
-        }
+            lttv_hooks_by_id_find(tfs->parent.event_by_id, th->id),
+                    th->h,
+                    th);
       }
     }
-    for(k = 0 ; k < hooks->len ; k++)
-      lttv_trace_hook_destroy(&g_array_index(hooks, LttvTraceHook, k));
+    lttv_trace_hook_remove_all(&hooks);
     g_array_free(hooks, TRUE);
   }
 }
@@ -3294,16 +3297,8 @@ static gboolean state_save_event_hook(void *hook_data, void *call_data)
   
   LttvTracefileState *self = (LttvTracefileState *)call_data;
 
-  LttvTracefileState *tfcs;
-
   LttvTraceState *tcs = (LttvTraceState *)(self->parent.t_context);
 
-  LttEventPosition *ep;
-
-  guint i;
-
-  LttTracefile *tf;
-
   LttvAttribute *saved_states_tree, *saved_state_tree;
 
   LttvAttributeValue value;
@@ -3831,8 +3826,8 @@ lttv_tracefile_state_get_type(void)
 
 static void module_init()
 {
-  LTTV_STATE_UNNAMED = g_quark_from_string("UNNAMED");
-  LTTV_STATE_UNBRANDED = g_quark_from_string("UNBRANDED");
+  LTTV_STATE_UNNAMED = g_quark_from_string("");
+  LTTV_STATE_UNBRANDED = g_quark_from_string("");
   LTTV_STATE_MODE_UNKNOWN = g_quark_from_string("MODE_UNKNOWN");
   LTTV_STATE_USER_MODE = g_quark_from_string("USER_MODE");
   LTTV_STATE_SYSCALL = g_quark_from_string("SYSCALL");
@@ -3863,6 +3858,7 @@ static void module_init()
   LTTV_STATE_TRACE_STATE_USE_COUNT = 
       g_quark_from_string("trace_state_use_count");
   LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu resource states");
+  LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu count");
   LTTV_STATE_RESOURCE_IRQS = g_quark_from_string("irq resource states");
   LTTV_STATE_RESOURCE_BLKDEVS = g_quark_from_string("blkdevs resource states");
 
@@ -3881,8 +3877,8 @@ static void module_init()
   LTT_EVENT_TRAP_EXIT     = g_quark_from_string("trap_exit");
   LTT_EVENT_IRQ_ENTRY     = g_quark_from_string("irq_entry");
   LTT_EVENT_IRQ_EXIT      = g_quark_from_string("irq_exit");
-  LTT_EVENT_SOFT_IRQ_ENTRY     = g_quark_from_string("soft_irq_entry");
-  LTT_EVENT_SOFT_IRQ_EXIT      = g_quark_from_string("soft_irq_exit");
+  LTT_EVENT_SOFT_IRQ_ENTRY     = g_quark_from_string("softirq_entry");
+  LTT_EVENT_SOFT_IRQ_EXIT      = g_quark_from_string("softirq_exit");
   LTT_EVENT_SCHED_SCHEDULE   = g_quark_from_string("sched_schedule");
   LTT_EVENT_PROCESS_FORK          = g_quark_from_string("process_fork");
   LTT_EVENT_KTHREAD_CREATE = g_quark_from_string("kthread_create");
@@ -3896,6 +3892,7 @@ static void module_init()
   LTT_EVENT_THREAD_BRAND  = g_quark_from_string("thread_brand");
   LTT_EVENT_REQUEST_ISSUE = g_quark_from_string("_blk_request_issue");
   LTT_EVENT_REQUEST_COMPLETE = g_quark_from_string("_blk_request_complete");
+  LTT_EVENT_LIST_INTERRUPT = g_quark_from_string("interrupt");;
 
 
   LTT_FIELD_SYSCALL_ID    = g_quark_from_string("syscall_id");
@@ -3921,6 +3918,7 @@ static void module_init()
   LTT_FIELD_MAJOR     = g_quark_from_string("major");
   LTT_FIELD_MINOR     = g_quark_from_string("minor");
   LTT_FIELD_OPERATION     = g_quark_from_string("direction");
+  LTT_FIELD_ACTION        = g_quark_from_string("action");
   
   LTTV_CPU_UNKNOWN = g_quark_from_string("unknown");
   LTTV_CPU_IDLE = g_quark_from_string("idle");
This page took 0.039092 seconds and 4 git commands to generate.