X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=f1441e0517aff10559cf07a92f6c20f974d734b5;hb=190724cdfc53eeebfd895b594f875b53a72adf37;hp=e810c6c325fa9d4bb271338644cf398237d34a86;hpb=88bf15f0f2a239186b5cf6fcf8711786907ca483;p=lttv.git

diff --git a/lttv/modules/gui/controlflow/drawing.c b/lttv/modules/gui/controlflow/drawing.c
index e810c6c3..f1441e05 100644
--- 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,21 +160,19 @@ 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);
+	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);	
+	lttv_hooks_add(event_hook,before_schedchange_hook , control_flow_data, LTTV_PRIO_STATE-5);	
 #ifdef BABEL_CLEANUP
 	lttv_hooks_add(event_hook,sched_try_wakeup , control_flow_data, LTTV_PRIO_STATE);	
 	lttv_hooks_add(event_hook,process_exit , control_flow_data, LTTV_PRIO_STATE);	
@@ -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;