X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=e1afc464b439606d3a0a0c7808116712ffdeeed1;hb=fae7b8ee15af7d3c4eea352cea6f73a1c89a5ac0;hp=02674d6af616bd6eb52cc3f425a6c71d1f848aa8;hpb=a18124ff571a52da3166455842735142ad067a89;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 02674d6a..e1afc464 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -481,7 +481,26 @@ 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,
@@ -536,6 +555,10 @@ int before_schedchange_hook(void *hook_data, void *call_data)
           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);
         }
       }
     }
@@ -603,7 +626,27 @@ 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(
@@ -660,6 +703,10 @@ int before_schedchange_hook(void *hook_data, void *call_data)
           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);
         }
       }
     }
@@ -1373,20 +1420,23 @@ int after_schedchange_hook(void *hook_data, void *call_data)
     drawing_insert_square( control_flow_data->drawing, y_in, height);
   }
 
-  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;
-  }
+  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;
 
 
@@ -1984,7 +2034,27 @@ 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(
@@ -2040,6 +2110,10 @@ int before_execmode_hook(void *hook_data, void *call_data)
       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);
     }
   }
   
@@ -2132,20 +2206,23 @@ int after_execmode_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,
-      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;
-  }
+  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;
 }
 
@@ -2254,7 +2331,27 @@ 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(
@@ -2310,6 +2407,10 @@ int before_process_hook(void *hook_data, void *call_data)
         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);
       }
     }
 
@@ -2422,27 +2523,31 @@ 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,
-        evtime,
-        width,
-        &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;
+      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 */
@@ -2493,19 +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,
-        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;
+    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;
 
@@ -2977,14 +3085,11 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
       const gchar *name = g_quark_to_string(process->name);
       
       /* process HAS to be present */
-      g_assert(processlist_get_process_pixels(process_list,
-              process_info->pid,
-              process_info->cpu,
-              &birth,
-              process_info->trace_num,
+      processlist_get_pixels_from_data(process_list,
+              process_info,
+              hashed_process_data,
               &y,
-              &height,
-              &hashed_process_data) != 1);
+              &height);
     
       /* Now, the process is in the state hash and our own process hash.
        * We definitely can draw the items related to the ending state.
@@ -2996,6 +3101,9 @@ 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;
 
@@ -3041,6 +3149,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
 
         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]);
@@ -3050,6 +3159,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
                            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;
@@ -3062,6 +3172,10 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
             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);
           }
         }
       }