projects / lttv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove unnecessary calls to get process pixels, but rare case
[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 02674d6af616bd6eb52cc3f425a6c71d1f848aa8..49a2109a98502dea28c2e46340d0e0d2d66ed6d7 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -428,6 +428,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
      * be added after the state update.  */
     LttvProcessState *process;
     process = lttv_state_find_process(tfs, pid_out);
+    //process = tfs->process;
     
     if(process != NULL) {
       /* Well, the process_out existed : we must get it in the process hash
@@ -451,6 +452,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       {
         g_assert(pid_out == 0 || pid_out != process->ppid);
         /* Process not present */
+        ProcessInfo *process_info;
         processlist_add(process_list,
             pid_out,
             process->last_cpu,
@@ -459,15 +461,13 @@ int before_schedchange_hook(void *hook_data, void *call_data)
             tfc->t_context->index,
             name,
             &pl_height,
+            &process_info,
             &hashed_process_data);
-        processlist_get_process_pixels(process_list,
-                pid_out,
-                process->last_cpu,
-                &birth,
-                tfc->t_context->index,
+        processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data,
                 &y,
-                &height,
-                &hashed_process_data);
+                &height);
         drawing_insert_square( drawing, y, height);
       }
     
@@ -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);
         }
       }
     }
@@ -573,6 +596,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       {
         g_assert(pid_in == 0 || pid_in != process->ppid);
         /* Process not present */
+        ProcessInfo *process_info;
         processlist_add(process_list,
             pid_in,
             process->last_cpu,
@@ -581,15 +605,13 @@ int before_schedchange_hook(void *hook_data, void *call_data)
             tfc->t_context->index,
             name,
             &pl_height,
+            &process_info,
             &hashed_process_data);
-        processlist_get_process_pixels(process_list,
-                pid_in,
-                process->last_cpu,
-                &birth,
-                tfc->t_context->index,
+        processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data,
                 &y,
-                &height,
-                &hashed_process_data);
+                &height);
         drawing_insert_square( drawing, y, height);
       }
     
@@ -603,7 +625,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 +702,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);
         }
       }
     }
@@ -1352,6 +1398,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
           &hashed_process_data_in) == 1)
   {
     g_assert(pid_in == 0 || pid_in != process_in->ppid);
+    ProcessInfo *process_info;
     /* Process not present */
     processlist_add(process_list,
         pid_in,
@@ -1361,32 +1408,33 @@ int after_schedchange_hook(void *hook_data, void *call_data)
         tfc->t_context->index,
         name,
         &pl_height,
+        &process_info,
         &hashed_process_data_in);
-    processlist_get_process_pixels(process_list,
-            pid_in,
-            process_in->last_cpu,
-            &birth,
-            tfc->t_context->index,
-            &y_in,
-            &height,
-            &hashed_process_data_in);
+    processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data_in,
+                &y_in,
+                &height);
     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;
 
 
@@ -1953,6 +2001,7 @@ int before_execmode_hook(void *hook_data, void *call_data)
           &hashed_process_data) == 1)
   {
     g_assert(pid == 0 || pid != process->ppid);
+    ProcessInfo *process_info;
     /* Process not present */
     processlist_add(process_list,
         pid,
@@ -1962,15 +2011,13 @@ int before_execmode_hook(void *hook_data, void *call_data)
         tfc->t_context->index,
         name,
         &pl_height,
+        &process_info,
         &hashed_process_data);
-    processlist_get_process_pixels(process_list,
-            pid,
-            process->last_cpu,
-            &birth,
-            tfc->t_context->index,
-            &y,
-            &height,
-            &hashed_process_data);
+    processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data,
+                &y,
+                &height);
     drawing_insert_square( drawing, y, height);
   }
 
@@ -1984,7 +2031,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 +2107,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);
     }
   }
   
@@ -2112,6 +2183,7 @@ int after_execmode_hook(void *hook_data, void *call_data)
   {
     g_assert(pid == 0 || pid != process->ppid);
     /* Process not present */
+    ProcessInfo *process_info;
     processlist_add(process_list,
         pid,
         process->last_cpu,
@@ -2120,32 +2192,33 @@ int after_execmode_hook(void *hook_data, void *call_data)
         tfc->t_context->index,
         name,
         &pl_height,
+        &process_info,
         &hashed_process_data);
-    processlist_get_process_pixels(process_list,
-            pid,
-            process->last_cpu,
-            &birth,
-            tfc->t_context->index,
-            &y,
-            &height,
-            &hashed_process_data);
+    processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data,
+                &y,
+                &height);
     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;
 }
 
@@ -2224,6 +2297,7 @@ int before_process_hook(void *hook_data, void *call_data)
     {
       g_assert(pid == 0 || pid != process->ppid);
       /* Process not present */
+      ProcessInfo *process_info;
       processlist_add(process_list,
           pid,
           process->last_cpu,
@@ -2232,15 +2306,13 @@ int before_process_hook(void *hook_data, void *call_data)
           tfc->t_context->index,
           name,
           &pl_height,
+          &process_info,
           &hashed_process_data);
-      processlist_get_process_pixels(process_list,
-              pid,
-              process->last_cpu,
-              &birth,
-              tfc->t_context->index,
-              &y,
-              &height,
-              &hashed_process_data);
+      processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data,
+                &y,
+                &height);
       drawing_insert_square( control_flow_data->drawing, y, height);
     }
 
@@ -2254,7 +2326,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 +2402,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);
       }
     }
 
@@ -2402,6 +2498,7 @@ int after_process_hook(void *hook_data, void *call_data)
     {
       g_assert(child_pid == 0 || child_pid != process_child->ppid);
       /* Process not present */
+      ProcessInfo *process_info;
       processlist_add(process_list,
           child_pid,
           process_child->last_cpu,
@@ -2410,39 +2507,41 @@ int after_process_hook(void *hook_data, void *call_data)
           tfc->t_context->index,
           name,
           &pl_height,
+          &process_info,
           &hashed_process_data_child);
-      processlist_get_process_pixels(process_list,
-              child_pid,
-              process_child->last_cpu,
-              &birth,
-              tfc->t_context->index,
-              &y_child,
-              &height,
-              &hashed_process_data_child);
+      processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data_child,
+                &y_child,
+                &height);
       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 */
@@ -2473,6 +2572,7 @@ int after_process_hook(void *hook_data, void *call_data)
     {
       g_assert(pid == 0 || pid != process->ppid);
       /* Process not present */
+      ProcessInfo *process_info;
       processlist_add(process_list,
           pid,
           process->last_cpu,
@@ -2481,31 +2581,32 @@ int after_process_hook(void *hook_data, void *call_data)
           tfc->t_context->index,
           name,
           &pl_height,
+          &process_info,
           &hashed_process_data);
-      processlist_get_process_pixels(process_list,
-              pid,
-              process->last_cpu,
-              &birth,
-              tfc->t_context->index,
-              &y,
-              &height,
-              &hashed_process_data);
+      processlist_get_pixels_from_data(process_list,
+                process_info,
+                hashed_process_data,
+                &y,
+                &height);
       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 +3078,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 +3094,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 +3142,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 +3152,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 +3165,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);
           }
         }
       }
LTTng 2.x Viewer (LTTV)
This page took 0.02949 seconds and 4 git commands to generate.