X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=6c1e89f764d049400c9debf26d4213be9c57098f;hb=96947fcfd1323ffb5e9f2ac484adb4432b69e90c;hp=14ae53593982d15f5bd782a12ec8e63b11828b92;hpb=6550d71135aed5d81a76d7d5625757570bcf0819;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 14ae5359..6c1e89f7 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -71,7 +71,6 @@
 #include "cfv.h"
 #include "processlist.h"
 #include "drawing.h"
-#include "cfv-private.h"
 
 
 #define MAX_PATH_LEN 256
@@ -236,7 +235,6 @@ h_guicontrolflow(Tab *tab)
   
   control_flow_data->tab = tab;
   
-  //g_debug("time width2 : %u",time_window->time_width);
   // Unreg done in the GuiControlFlow_Destructor
   lttvwindow_register_traceset_notify(tab,
         traceset_notify,
@@ -392,8 +390,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
 
   LttTime evtime = ltt_event_time(e);
 
-  guint width = drawing->width;
-
   /* we are in a schedchange, before the state update. We must draw the
    * items corresponding to the state before it changes : now is the right
    * time to do it.
@@ -489,7 +485,8 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                 || ltt_time_compare(evtime, time_window.end_time) == 1)
                     return;
 #endif //EXTRA_CHECK
-
+          
+          guint width = drawing->width;
           guint x;
           convert_time_to_pixels(
                     time_window,
@@ -519,7 +516,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
               || ltt_time_compare(evtime, time_window.end_time) == 1)
                   return;
 #endif //EXTRA_CHECK
-
+        guint width = drawing->width;
         guint x;
         convert_time_to_pixels(
                   time_window,
@@ -660,6 +657,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                 || ltt_time_compare(evtime, time_window.end_time) == 1)
                     return;
 #endif //EXTRA_CHECK
+          guint width = drawing->width;
           guint x;
           convert_time_to_pixels(
                     time_window,
@@ -687,6 +685,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
               || ltt_time_compare(evtime, time_window.end_time) == 1)
                   return;
 #endif //EXTRA_CHECK
+        guint width = drawing->width;
         guint x;
 
         convert_time_to_pixels(
@@ -1388,8 +1387,6 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 
   LttTime evtime = ltt_event_time(e);
 
-  guint width = control_flow_data->drawing->width;
-
   /* Add process to process list (if not present) */
   LttvProcessState *process_out, *process_in;
   LttTime birth;
@@ -1415,8 +1412,9 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   //process_in = lttv_state_find_process(tfs, pid_in);
   process_in = tfs->process;
   /* It should exist, because we are after the state update. */
+#ifdef EXTRA_CHECK
   g_assert(process_in != NULL);
-
+#endif //EXTRA_CHECK
   birth = process_in->creation_time;
 
   hashed_process_data_in = processlist_get_process_data(process_list,
@@ -1466,6 +1464,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
             return;
 #endif //EXTRA_CHECK
 
+    guint width = control_flow_data->drawing->width;
     guint new_x;
     
     convert_time_to_pixels(
@@ -2003,7 +2002,6 @@ int before_execmode_hook(void *hook_data, void *call_data)
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  guint width = drawing->width;
 
   /* we are in a execmode, before the state update. We must draw the
    * items corresponding to the state before it changes : now is the right
@@ -2086,6 +2084,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
             || ltt_time_compare(evtime, time_window.end_time) == 1)
                 return;
 #endif //EXTRA_CHECK
+      guint width = drawing->width;
       guint x;
       convert_time_to_pixels(
                 time_window,
@@ -2114,6 +2113,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
           || ltt_time_compare(evtime, time_window.end_time) == 1)
               return;
 #endif //EXTRA_CHECK
+    guint width = drawing->width;
     guint x;
 
     convert_time_to_pixels(
@@ -2209,7 +2209,6 @@ int after_execmode_hook(void *hook_data, void *call_data)
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  guint width = control_flow_data->drawing->width;
 
   /* Add process to process list (if not present) */
   LttvProcessState *process;
@@ -2280,8 +2279,7 @@ int after_execmode_hook(void *hook_data, void *call_data)
           || ltt_time_compare(evtime, time_window.end_time) == 1)
               return;
 #endif //EXTRA_CHECK
-
-
+    guint width = control_flow_data->drawing->width;
     guint new_x;
     
     convert_time_to_pixels(
@@ -2326,7 +2324,6 @@ int before_process_hook(void *hook_data, void *call_data)
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  guint width = control_flow_data->drawing->width;
 
   guint sub_id;
   {
@@ -2411,6 +2408,7 @@ int before_process_hook(void *hook_data, void *call_data)
                   return;
 #endif //EXTRA_CHECK
 
+        guint width = drawing->width;
         guint x;
         convert_time_to_pixels(
                   time_window,
@@ -2439,7 +2437,7 @@ int before_process_hook(void *hook_data, void *call_data)
             || ltt_time_compare(evtime, time_window.end_time) == 1)
                 return;
 #endif //EXTRA_CHECK
-
+      guint width = drawing->width;
       guint x;
 
       convert_time_to_pixels(
@@ -2527,6 +2525,7 @@ int after_process_hook(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
+  Drawing_t *drawing = control_flow_data->drawing;
 
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
@@ -2537,7 +2536,6 @@ int after_process_hook(void *hook_data, void *call_data)
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  guint width = control_flow_data->drawing->width;
 
   guint sub_id;
   guint param1;
@@ -2615,6 +2613,7 @@ int after_process_hook(void *hook_data, void *call_data)
                 return;
 #endif //EXTRA_CHECK
 
+      guint width = drawing->width;
       guint new_x;
       convert_time_to_pixels(
           time_window,
@@ -2709,6 +2708,7 @@ int after_process_hook(void *hook_data, void *call_data)
                 return;
 #endif //EXTRA_CHECK
 
+      guint width = drawing->width;
       guint new_x;
       convert_time_to_pixels(
           time_window,
@@ -3147,7 +3147,6 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss;
 
   LttTime evtime = closure_data->end_time;
-  guint width = drawing->width;
 
   { 
     /* For the process */
@@ -3208,6 +3207,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
               || ltt_time_compare(evtime, time_window.end_time) == 1)
                   return;
 #endif //EXTRA_CHECK
+        guint width = drawing->width;
         guint x;
 
         convert_time_to_pixels(