Reenable resource view

[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 e810c6c325fa9d4bb271338644cf398237d34a86..9fac5cd3cd1440430047c36951328d2850f9e61c 100644 (file)
--- a/lttv/modules/gui/controlflow/drawing.c
+++ b/lttv/modules/gui/controlflow/drawing.c
@@ -27,9 +27,6 @@
 #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 +162,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 +184,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;