X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=02674d6af616bd6eb52cc3f425a6c71d1f848aa8;hb=a18124ff571a52da3166455842735142ad067a89;hp=d3c454d2579274cbb7a81d409b1eb7d5fcf21cb3;hpb=5c230fc4452672cb8c62b2b350c8f8e1d7d579d9;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 d3c454d2..02674d6a 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -394,12 +394,12 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
-
+  LttTime end_time = time_window.end_time;
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
   guint width = drawing->width;
 
   /* we are in a schedchange, before the state update. We must draw the
@@ -484,8 +484,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       {
         guint x;
         convert_time_to_pixels(
-                  time_window.start_time,
-                  end_time,
+                  time_window,
                   evtime,
                   width,
                   &x);
@@ -608,8 +607,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
         guint x;
 
         convert_time_to_pixels(
-                  time_window.start_time,
-                  end_time,
+                  time_window,
                   evtime,
                   width,
                   &x);
@@ -687,8 +685,8 @@ int before_schedchange_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
+
   //if(time < time_beg || time > time_end) return;
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
@@ -798,13 +796,10 @@ int before_schedchange_hook(void *hook_data, void *call_data)
 
     LttTime time = ltt_event_time(e);
 
-    LttTime window_end = ltt_time_add(time_window.time_width,
-                          time_window.start_time);
-
+    LttTime window_end = time_window.end_time;
     
     convert_time_to_pixels(
-        time_window.start_time,
-        window_end,
+        time_window,
         time,
         width,
         &x);
@@ -1308,12 +1303,13 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
 
   guint width = control_flow_data->drawing->width;
 
@@ -1380,8 +1376,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   guint new_x;
   
   convert_time_to_pixels(
-      time_window.start_time,
-      end_time,
+      time_window,
       evtime,
       width,
       &new_x);
@@ -1415,8 +1410,8 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
+
   //if(time < time_beg || time > time_end) return;
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
@@ -1528,13 +1523,11 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 
     //LttTime time = ltt_event_time(e);
 
-    //LttTime window_end = ltt_time_add(time_window->time_width,
-    //                      time_window->start_time);
+    //LttTime window_end = time_window->end_time;
 
     
     //convert_time_to_pixels(
-    //    time_window->start_time,
-    //    window_end,
+    //    *time_window,
     //    time,
     //    width,
     //    &x);
@@ -1920,12 +1913,13 @@ int before_execmode_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
 
   guint width = drawing->width;
 
@@ -1994,8 +1988,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
     guint x;
 
     convert_time_to_pixels(
-        time_window.start_time,
-        end_time,
+        time_window,
         evtime,
         width,
         &x);
@@ -2080,12 +2073,13 @@ int after_execmode_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
 
   guint width = control_flow_data->drawing->width;
 
@@ -2141,8 +2135,7 @@ int after_execmode_hook(void *hook_data, void *call_data)
   guint new_x;
   
   convert_time_to_pixels(
-      time_window.start_time,
-      end_time,
+      time_window,
       evtime,
       width,
       &new_x);
@@ -2186,12 +2179,13 @@ int before_process_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
 
   guint width = control_flow_data->drawing->width;
 
@@ -2264,8 +2258,7 @@ int before_process_hook(void *hook_data, void *call_data)
       guint x;
 
       convert_time_to_pixels(
-          time_window.start_time,
-          end_time,
+          time_window,
           evtime,
           width,
           &x);
@@ -2358,12 +2351,13 @@ int after_process_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
 
   guint width = control_flow_data->drawing->width;
 
@@ -2430,8 +2424,7 @@ int after_process_hook(void *hook_data, void *call_data)
 
     guint new_x;
     convert_time_to_pixels(
-        time_window.start_time,
-        end_time,
+        time_window,
         evtime,
         width,
         &new_x);
@@ -2502,8 +2495,7 @@ int after_process_hook(void *hook_data, void *call_data)
 
     guint new_x;
     convert_time_to_pixels(
-        time_window.start_time,
-        end_time,
+        time_window,
         evtime,
         width,
         &new_x);
@@ -2563,11 +2555,11 @@ gint update_time_window_hook(void *hook_data, void *call_data)
     /* Same scale (scrolling) */
     g_info("scrolling");
     LttTime *ns = &new_time_window->start_time;
+    LttTime *nw = &new_time_window->time_width;
     LttTime *os = &old_time_window->start_time;
-    LttTime old_end = ltt_time_add(old_time_window->start_time,
-                                    old_time_window->time_width);
-    LttTime new_end = ltt_time_add(new_time_window->start_time,
-                                    new_time_window->time_width);
+    LttTime *ow = &old_time_window->time_width;
+    LttTime old_end = old_time_window->end_time;
+    LttTime new_end = new_time_window->end_time;
     //if(ns<os+w<ns+w)
     //if(ns<os+w && os+w<ns+w)
     //if(ns<old_end && os<ns)
@@ -2579,8 +2571,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
       guint x = 0;
       guint width = control_flow_data->drawing->width;
       convert_time_to_pixels(
-          *os,
-          old_end,
+          *old_time_window,
           *ns,
           width,
           &x);
@@ -2632,8 +2623,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
         guint x = 0;
         guint width = control_flow_data->drawing->width;
         convert_time_to_pixels(
-            *ns,
-            new_end,
+            *new_time_window,
             *os,
             width,
             &x);
@@ -2889,6 +2879,8 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   
     new_time_window.start_time = time_begin;
     new_time_window.time_width = width;
+    new_time_window.time_width_double = ltt_time_to_double(width);
+    new_time_window.end_time = ltt_time_add(time_begin, width);
 
     lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
   }
@@ -2903,6 +2895,8 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   
     new_time_window.start_time = time_begin;
     new_time_window.time_width = width;
+    new_time_window.time_width_double = ltt_time_to_double(width);
+    new_time_window.end_time = ltt_time_add(time_begin, width);
 
     lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
     
@@ -2940,12 +2934,13 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
+#ifdef EXTRA_CHECK
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
+#endif //EXTRA_CHECK
 
   guint width = drawing->width;
 
@@ -3005,8 +3000,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
         guint x;
 
         convert_time_to_pixels(
-            time_window.start_time,
-            end_time,
+            time_window,
             evtime,
             width,
             &x);