projects / lttv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
time to pixels optimised
[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / eventhooks.c
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 4441712a3d88c3ea2337bda5030aaaa38d0b40f6..01a49c3b7ce8541aa6040c2016a9e5f1dded803f 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -97,8 +97,7 @@ static void process_add(gpointer key,
   LttTime birth;
   guint y = 0, height = 0, pl_height = 0;
 
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
 
   pid = process->pid;
   birth = process->creation_time;
@@ -395,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
@@ -437,8 +436,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
        /* Add process to process list (if not present) */
       guint y = 0, height = 0, pl_height = 0;
       HashedProcessData *hashed_process_data = NULL;
-      ProcessList *process_list = 
-                      guicontrolflow_get_process_list(control_flow_data);
+      ProcessList *process_list = control_flow_data->process_list;
       LttTime birth = process->creation_time;
       const gchar *name = g_quark_to_string(process->name);
       
@@ -483,19 +481,47 @@ int before_schedchange_hook(void *hook_data, void *call_data)
        * value.
        */
       g_assert(hashed_process_data->x.middle != -1);
+      if(ltt_time_compare(hashed_process_data->next_good_time,
+                          evtime) > 0)
       {
+        if(hashed_process_data->x.middle_marked == FALSE) {
+          guint x;
+          convert_time_to_pixels(
+                    time_window,
+                    evtime,
+                    width,
+                    &x);
+
+          /* Draw collision indicator */
+          gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+          gdk_draw_point(drawing->pixmap,
+                         drawing->gc,
+                         x,
+                         y+(height/2)-3);
+          hashed_process_data->x.middle_marked = TRUE;
+        }
+      } else {
         guint x;
         convert_time_to_pixels(
-                  time_window.start_time,
-                  end_time,
+                  time_window,
                   evtime,
                   width,
                   &x);
 
 
         /* Jump over draw if we are at the same x position */
-        if(x == hashed_process_data->x.middle)
+        if(x == hashed_process_data->x.middle &&
+             hashed_process_data->x.middle_used)
         {
+          if(hashed_process_data->x.middle_marked == FALSE) {
+            /* Draw collision indicator */
+            gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+            gdk_draw_point(drawing->pixmap,
+                           drawing->gc,
+                           x,
+                           y+(height/2)-3);
+            hashed_process_data->x.middle_marked = TRUE;
+          }
           /* jump */
         } else {
           DrawContext draw_context;
@@ -527,6 +553,12 @@ int before_schedchange_hook(void *hook_data, void *call_data)
           }
           /* become the last x position */
           hashed_process_data->x.middle = x;
+          hashed_process_data->x.middle_used = TRUE;
+          hashed_process_data->x.middle_marked = FALSE;
+
+          /* Calculate the next good time */
+          convert_pixels_to_time(width, x+1, time_window,
+                                 &hashed_process_data->next_good_time);
         }
       }
     }
@@ -549,8 +581,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
        /* Add process to process list (if not present) */
       guint y = 0, height = 0, pl_height = 0;
       HashedProcessData *hashed_process_data = NULL;
-      ProcessList *process_list = 
-                      guicontrolflow_get_process_list(control_flow_data);
+      ProcessList *process_list = control_flow_data->process_list;
       LttTime birth = process->creation_time;
       const gchar *name = g_quark_to_string(process->name);
       
@@ -595,20 +626,49 @@ int before_schedchange_hook(void *hook_data, void *call_data)
        * value.
        */
       g_assert(hashed_process_data->x.middle != -1);
+
+      if(ltt_time_compare(hashed_process_data->next_good_time,
+                          evtime) > 0)
       {
+        if(hashed_process_data->x.middle_marked == FALSE) {
+          guint x;
+          convert_time_to_pixels(
+                    time_window,
+                    evtime,
+                    width,
+                    &x);
+
+          /* Draw collision indicator */
+          gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+          gdk_draw_point(drawing->pixmap,
+                         drawing->gc,
+                         x,
+                         y+(height/2)-3);
+          hashed_process_data->x.middle_marked = TRUE;
+        }
+      } else {
         guint x;
 
         convert_time_to_pixels(
-                  time_window.start_time,
-                  end_time,
+                  time_window,
                   evtime,
                   width,
                   &x);
 
 
         /* Jump over draw if we are at the same x position */
-        if(x == hashed_process_data->x.middle)
+        if(x == hashed_process_data->x.middle &&
+            hashed_process_data->x.middle_used)
         {
+          if(hashed_process_data->x.middle_marked == FALSE) {
+            /* Draw collision indicator */
+            gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+            gdk_draw_point(drawing->pixmap,
+                           drawing->gc,
+                           x,
+                           y+(height/2)-3);
+            hashed_process_data->x.middle_marked = TRUE;
+          }
           /* jump */
         } else {
           DrawContext draw_context;
@@ -641,6 +701,12 @@ int before_schedchange_hook(void *hook_data, void *call_data)
           
           /* become the last x position */
           hashed_process_data->x.middle = x;
+          hashed_process_data->x.middle_used = TRUE;
+          hashed_process_data->x.middle_marked = FALSE;
+
+          /* Calculate the next good time */
+          convert_pixels_to_time(width, x+1, time_window,
+                                 &hashed_process_data->next_good_time);
         }
       }
     }
@@ -666,8 +732,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)
@@ -684,8 +750,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
     LttTime birth;
     guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
+    ProcessList *process_list = control_flow_data->process_list;
 
 
     LttField *f = ltt_event_field(e);
@@ -778,13 +843,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);
@@ -1288,12 +1350,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;
 
@@ -1303,8 +1366,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
   HashedProcessData *hashed_process_data_in = NULL;
 
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
   
   guint pid_in;
   {
@@ -1358,16 +1420,29 @@ int after_schedchange_hook(void *hook_data, void *call_data)
     drawing_insert_square( control_flow_data->drawing, y_in, height);
   }
 
-  convert_time_to_pixels(
-      time_window.start_time,
-      end_time,
-      evtime,
-      width,
-      &hashed_process_data_in->x.middle);
+  if(ltt_time_compare(hashed_process_data_in->next_good_time,
+                          evtime) <= 0)
+  {
+    guint new_x;
+    
+    convert_time_to_pixels(
+        time_window,
+        evtime,
+        width,
+        &new_x);
+
+    if(hashed_process_data_in->x.middle != new_x) {
+      hashed_process_data_in->x.middle = new_x;
+      hashed_process_data_in->x.middle_used = FALSE;
+      hashed_process_data_in->x.middle_marked = FALSE;
+    }
+  }
   return 0;
 
 
 
+
+
 #if 0
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
@@ -1385,8 +1460,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)
@@ -1404,8 +1479,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
     LttTime birth;
     guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
+    ProcessList *process_list = control_flow_data->process_list;
 
 
     LttField *f = ltt_event_field(e);
@@ -1499,13 +1573,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);
@@ -1891,12 +1963,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;
 
@@ -1916,8 +1989,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
    /* Add process to process list (if not present) */
   guint y = 0, height = 0, pl_height = 0;
   HashedProcessData *hashed_process_data = NULL;
-  ProcessList *process_list = 
-                  guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
   LttTime birth = process->creation_time;
   const gchar *name = g_quark_to_string(process->name);
   
@@ -1962,20 +2034,49 @@ int before_execmode_hook(void *hook_data, void *call_data)
    * value.
    */
   g_assert(hashed_process_data->x.over != -1);
+
+  if(ltt_time_compare(hashed_process_data->next_good_time,
+                      evtime) > 0)
   {
+    if(hashed_process_data->x.middle_marked == FALSE) {
+      guint x;
+      convert_time_to_pixels(
+                time_window,
+                evtime,
+                width,
+                &x);
+
+      /* Draw collision indicator */
+      gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+      gdk_draw_point(drawing->pixmap,
+                     drawing->gc,
+                     x,
+                     y+(height/2)-3);
+      hashed_process_data->x.middle_marked = TRUE;
+    }
+  } else {
     guint x;
 
     convert_time_to_pixels(
-        time_window.start_time,
-        end_time,
+        time_window,
         evtime,
         width,
         &x);
 
 
     /* Jump over draw if we are at the same x position */
-    if(x == hashed_process_data->x.middle)
+    if(x == hashed_process_data->x.middle &&
+             hashed_process_data->x.middle_used)
     {
+      if(hashed_process_data->x.middle_marked == FALSE) {
+        /* Draw collision indicator */
+        gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+        gdk_draw_point(drawing->pixmap,
+                       drawing->gc,
+                       x,
+                       y+(height/2)-3);
+        hashed_process_data->x.middle_marked = TRUE;
+      }
       /* jump */
     } else {
 
@@ -2007,6 +2108,12 @@ int before_execmode_hook(void *hook_data, void *call_data)
       }
       /* become the last x position */
       hashed_process_data->x.middle = x;
+      hashed_process_data->x.middle_used = TRUE;
+      hashed_process_data->x.middle_marked = FALSE;
+
+      /* Calculate the next good time */
+      convert_pixels_to_time(width, x+1, time_window,
+                             &hashed_process_data->next_good_time);
     }
   }
   
@@ -2040,12 +2147,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;
 
@@ -2055,9 +2163,7 @@ int after_execmode_hook(void *hook_data, void *call_data)
   guint y = 0, height = 0, pl_height = 0;
   HashedProcessData *hashed_process_data = NULL;
 
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
-  
+  ProcessList *process_list = control_flow_data->process_list;
 
   /* Find process pid_in in the list... */
   process = tfs->process;
@@ -2099,13 +2205,24 @@ int after_execmode_hook(void *hook_data, void *call_data)
             &hashed_process_data);
     drawing_insert_square( control_flow_data->drawing, y, height);
   }
+  
+  if(ltt_time_compare(hashed_process_data->next_good_time,
+                          evtime) <= 0)
+  {
+    guint new_x;
+    
+    convert_time_to_pixels(
+        time_window,
+        evtime,
+        width,
+        &new_x);
 
-  convert_time_to_pixels(
-      time_window.start_time,
-      end_time,
-      evtime,
-      width,
-      &hashed_process_data->x.over);
+    if(hashed_process_data->x.middle != new_x) {
+      hashed_process_data->x.middle = new_x;
+      hashed_process_data->x.middle_used = FALSE;
+      hashed_process_data->x.middle_marked = FALSE;
+    }
+  }
   return 0;
 }
 
@@ -2139,12 +2256,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;
 
@@ -2165,8 +2283,7 @@ int before_process_hook(void *hook_data, void *call_data)
     guint y = 0, height = 0, pl_height = 0;
     HashedProcessData *hashed_process_data = NULL;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
+    ProcessList *process_list = control_flow_data->process_list;
     
     g_assert(process != NULL);
 
@@ -2214,20 +2331,49 @@ int before_process_hook(void *hook_data, void *call_data)
      * value.
      */
     g_assert(hashed_process_data->x.over != -1);
+
+    if(ltt_time_compare(hashed_process_data->next_good_time,
+                        evtime) > 0)
     {
+      if(hashed_process_data->x.middle_marked == FALSE) {
+        guint x;
+        convert_time_to_pixels(
+                  time_window,
+                  evtime,
+                  width,
+                  &x);
+
+        /* Draw collision indicator */
+        gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+        gdk_draw_point(drawing->pixmap,
+                       drawing->gc,
+                       x,
+                       y+(height/2)-3);
+        hashed_process_data->x.middle_marked = TRUE;
+      }
+    } else {
       guint x;
 
       convert_time_to_pixels(
-          time_window.start_time,
-          end_time,
+          time_window,
           evtime,
           width,
           &x);
 
 
       /* Jump over draw if we are at the same x position */
-      if(x == hashed_process_data->x.middle)
-      {
+      if(x == hashed_process_data->x.middle &&
+             hashed_process_data->x.middle_used)
+      { 
+        if(hashed_process_data->x.middle_marked == FALSE) {
+          /* Draw collision indicator */
+          gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+          gdk_draw_point(drawing->pixmap,
+                         drawing->gc,
+                         x,
+                         y+(height/2)-3);
+          hashed_process_data->x.middle_marked = TRUE;
+        }
         /* jump */
       } else {
         DrawContext draw_context;
@@ -2259,6 +2405,12 @@ int before_process_hook(void *hook_data, void *call_data)
         }
         /* become the last x position */
         hashed_process_data->x.middle = x;
+        hashed_process_data->x.middle_used = TRUE;
+        hashed_process_data->x.middle_marked = FALSE;
+
+        /* Calculate the next good time */
+        convert_pixels_to_time(width, x+1, time_window,
+                               &hashed_process_data->next_good_time);
       }
     }
 
@@ -2300,12 +2452,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;
 
@@ -2329,9 +2482,7 @@ int after_process_hook(void *hook_data, void *call_data)
     guint y_child = 0, height = 0, pl_height = 0;
     HashedProcessData *hashed_process_data_child = NULL;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
-    
+    ProcessList *process_list = control_flow_data->process_list;
 
     /* Find child in the list... */
     process_child = lttv_state_find_process(tfs, child_pid);
@@ -2372,16 +2523,32 @@ int after_process_hook(void *hook_data, void *call_data)
       drawing_insert_square( control_flow_data->drawing, y_child, height);
     }
 
-    guint new_x;
-    convert_time_to_pixels(
-        time_window.start_time,
-        end_time,
-        evtime,
-        width,
-        &new_x);
-    hashed_process_data_child->x.over = new_x;
-    hashed_process_data_child->x.middle = new_x;
-    hashed_process_data_child->x.under = new_x;
+    if(ltt_time_compare(hashed_process_data_child->next_good_time,
+                          evtime) <= 0)
+    {
+      guint new_x;
+      convert_time_to_pixels(
+          time_window,
+          evtime,
+          width,
+          &new_x);
+
+      if(hashed_process_data_child->x.over != new_x) {
+        hashed_process_data_child->x.over = new_x;
+        hashed_process_data_child->x.over_used = FALSE;
+        hashed_process_data_child->x.over_marked = FALSE;
+      }
+      if(hashed_process_data_child->x.middle != new_x) {
+        hashed_process_data_child->x.middle = new_x;
+        hashed_process_data_child->x.middle_used = FALSE;
+        hashed_process_data_child->x.middle_marked = FALSE;
+      }
+      if(hashed_process_data_child->x.under != new_x) {
+        hashed_process_data_child->x.under = new_x;
+        hashed_process_data_child->x.under_used = FALSE;
+        hashed_process_data_child->x.under_marked = FALSE;
+      }
+    }
 
   } else if(sub_id == 3) { /* exit */
 
@@ -2392,9 +2559,7 @@ int after_process_hook(void *hook_data, void *call_data)
     guint y = 0, height = 0, pl_height = 0;
     HashedProcessData *hashed_process_data = NULL;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
-    
+    ProcessList *process_list = control_flow_data->process_list;
 
     /* It should exist, because we are after the state update. */
     g_assert(process != NULL);
@@ -2433,14 +2598,22 @@ int after_process_hook(void *hook_data, void *call_data)
       drawing_insert_square( control_flow_data->drawing, y, height);
     }
 
-    guint new_x;
-    convert_time_to_pixels(
-        time_window.start_time,
-        end_time,
-        evtime,
-        width,
-        &new_x);
-    hashed_process_data->x.middle = new_x;
+    if(ltt_time_compare(hashed_process_data->next_good_time,
+                          evtime) <= 0)
+    {
+      guint new_x;
+      convert_time_to_pixels(
+          time_window,
+          evtime,
+          width,
+          &new_x);
+      if(hashed_process_data->x.middle != new_x) {
+        hashed_process_data->x.middle = new_x;
+        hashed_process_data->x.middle_used = FALSE;
+        hashed_process_data->x.middle_marked = FALSE;
+      }
+    }
+
   }
   return 0;
 
@@ -2490,11 +2663,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)
@@ -2506,8 +2679,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);
@@ -2559,8 +2731,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);
@@ -2816,6 +2987,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);
   }
@@ -2830,6 +3003,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);
     
@@ -2867,12 +3042,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;
 
@@ -2899,8 +3075,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
       /* Only draw for processes that are currently in the trace states */
 
       guint y = 0, height = 0, pl_height = 0;
-      ProcessList *process_list = 
-                      guicontrolflow_get_process_list(control_flow_data);
+      ProcessList *process_list = control_flow_data->process_list;
       LttTime birth = process_info->birth;
       
       /* Should be alike when background info is ready */
@@ -2929,12 +3104,14 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
        * value.
        */
       g_assert(hashed_process_data->x.over != -1);
+
+      if(ltt_time_compare(hashed_process_data->next_good_time,
+                            evtime) <= 0)
       {
         guint x;
 
         convert_time_to_pixels(
-            time_window.start_time,
-            end_time,
+            time_window,
             evtime,
             width,
             &x);
@@ -2973,7 +3150,19 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
         }
 #endif //0
 
-        if(x == hashed_process_data->x.middle) {
+        if(x == hashed_process_data->x.middle &&
+            hashed_process_data->x.middle_used) {
+#if 0 /* do not mark closure : not missing information */
+          if(hashed_process_data->x.middle_marked == FALSE) {
+            /* Draw collision indicator */
+            gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+            gdk_draw_point(drawing->pixmap,
+                           drawing->gc,
+                           x,
+                           y+(height/2)-3);
+            hashed_process_data->x.middle_marked = TRUE;
+          }
+#endif //0
           /* Jump */
         } else {
           draw_context.drawinfo.start.x = hashed_process_data->x.middle;
@@ -2982,7 +3171,15 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
           draw_line((void*)&prop_line, (void*)&draw_context);
 
            /* become the last x position */
-          hashed_process_data->x.middle = x;
+          if(x != hashed_process_data->x.middle) {
+            hashed_process_data->x.middle = x;
+            /* but don't use the pixel */
+            hashed_process_data->x.middle_used = FALSE;
+
+            /* Calculate the next good time */
+            convert_pixels_to_time(width, x+1, time_window,
+                                  &hashed_process_data->next_good_time);
+          }
         }
       }
     }
@@ -3027,8 +3224,7 @@ int after_request(void *hook_data, void *call_data)
   LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data);
   LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data);
   
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
   LttTime end_time = events_request->end_time;
 
   ClosureData closure_data;
@@ -3059,8 +3255,7 @@ int after_chunk(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc);
   LttTime end_time;
   
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
 
   if(tfc != NULL)
     end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);
LTTng 2.x Viewer (LTTV)
This page took 0.031861 seconds and 4 git commands to generate.