Remove reference to thread brand

[lttv.git] / lttv / modules / gui / controlflow / drawing.c

diff --git a/lttv/modules/gui/controlflow/drawing.c b/lttv/modules/gui/controlflow/drawing.c
index fd1333839ffeab0840f031f7644ed2f96d9f0631..eeb27e4719f026ec66e6ef151da301c0304449d9 100644 (file)
--- a/lttv/modules/gui/controlflow/drawing.c
+++ b/lttv/modules/gui/controlflow/drawing.c
@@ -24,12 +24,7 @@
 #include <gdk/gdk.h>
 #include <string.h>
 
-#include <ltt/trace.h>
-
 #include <lttv/lttv.h>
-#ifdef BABEL_CLEANUP
-#include <lttv/tracecontext.h>
-#endif //babel_cleanup
 #include <lttvwindow/lttvwindow.h>
 #include <lttv/state.h>
 #include <lttv/hook.h>
@@ -165,19 +160,17 @@ void drawing_data_request(Drawing_t *drawing,
                                        control_flow_data);
 
   {
-        LttvHooks *event_hook;
-//TODO "fdeslauriers : Is it the right way to get the hooks - july 11 2012"
-       event_hook = lttv_traceset_get_hooks(traceset);
+        LttvHooks *event_hook = lttv_hooks_new();
        g_assert(event_hook);
  
        lttv_hooks_add(event_hook,before_execmode_hook , control_flow_data, LTTV_PRIO_STATE-5);
    #ifdef BABEL_CLEANUP     
-       lttv_hooks_add(event_hook,syscall_exit , control_flow_data, LTTV_PRIO_STATE);   
-       lttv_hooks_add(event_hook,irq_entry , control_flow_data, LTTV_PRIO_STATE);      
-       lttv_hooks_add(event_hook,irq_exit , control_flow_data, LTTV_PRIO_STATE);       
-       lttv_hooks_add(event_hook,soft_irq_raise , control_flow_data, LTTV_PRIO_STATE); 
-       lttv_hooks_add(event_hook,soft_irq_entry , control_flow_data, LTTV_PRIO_STATE); 
-       lttv_hooks_add(event_hook,soft_irq_exit , control_flow_data, LTTV_PRIO_STATE);  
+       lttv_hooks_add(event_hook,syscall_exit , control_flow_data, LTTV_PRIO_STATE);
+       lttv_hooks_add(event_hook,irq_entry , control_flow_data, LTTV_PRIO_STATE);
+       lttv_hooks_add(event_hook,irq_exit , control_flow_data, LTTV_PRIO_STATE);
+       lttv_hooks_add(event_hook,soft_irq_raise , control_flow_data, LTTV_PRIO_STATE);
+       lttv_hooks_add(event_hook,soft_irq_entry , control_flow_data, LTTV_PRIO_STATE);
+       lttv_hooks_add(event_hook,soft_irq_exit , control_flow_data, LTTV_PRIO_STATE);
 #endif //babel_cleanup
        lttv_hooks_add(event_hook,before_schedchange_hook , control_flow_data, LTTV_PRIO_STATE-5);      
 #ifdef BABEL_CLEANUP
@@ -189,7 +182,15 @@ void drawing_data_request(Drawing_t *drawing,
        lttv_hooks_add(event_hook,statedump_end , control_flow_data, LTTV_PRIO_STATE);  
        lttv_hooks_add(event_hook,enum_interrupt , control_flow_data, LTTV_PRIO_STATE);
 #endif //babel_cleanup
-       
+       lttv_hooks_add(event_hook, before_trywakeup_hook, control_flow_data, LTTV_PRIO_STATE-5);
+       lttv_hooks_add(event_hook, before_process_exit_hook, control_flow_data, LTTV_PRIO_STATE-5);
+       lttv_hooks_add(event_hook, before_process_release_hook, control_flow_data, LTTV_PRIO_STATE-5);
+       lttv_hooks_add(event_hook, before_statedump_end, control_flow_data, LTTV_PRIO_STATE-5);     
+
+       lttv_hooks_add(event_hook, after_schedchange_hook, control_flow_data, LTTV_PRIO_STATE+5);
+       lttv_hooks_add(event_hook, after_process_fork_hook, control_flow_data, LTTV_PRIO_STATE+5);
+       lttv_hooks_add(event_hook, after_process_exit_hook, control_flow_data, LTTV_PRIO_STATE+5);
+       lttv_hooks_add(event_hook, after_event_enum_process_hook, control_flow_data, LTTV_PRIO_STATE+5);
 
     guint i, k, nb_trace;
     LttvTraceState *ts;
@@ -410,14 +411,6 @@ void drawing_data_request(Drawing_t *drawing,
           events_request,
           &hooks);
 
-      lttv_trace_find_hook(ts->parent.t,
-          LTT_CHANNEL_USERSPACE,
-          LTT_EVENT_THREAD_BRAND,
-          FIELD_ARRAY(LTT_FIELD_NAME),
-          after_user_generic_thread_brand_hook,
-          events_request,
-          &hooks);
-
       lttv_trace_find_hook(ts->parent.t,
           LTT_CHANNEL_TASK_STATE,
           LTT_EVENT_PROCESS_STATE,