removed some pointer dereference from critical path
[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / eventhooks.c
index 5c828c284dfaf5a18970968289aff23d040ea3a2..9556d2dde030dabee402e868c3375615fb17a040 100644 (file)
@@ -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,
@@ -271,7 +269,7 @@ int event_selected_hook(void *hook_data, void *call_data)
 }
 
 /* Function that selects the color of status&exemode line */
-static __inline__ PropertiesLine prepare_s_e_line(LttvProcessState *process)
+static inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 2;
@@ -318,7 +316,7 @@ static __inline__ PropertiesLine prepare_s_e_line(LttvProcessState *process)
 }
 
 #if 0
-static __inline__ PropertiesLine prepare_status_line(LttvProcessState *process)
+static inline PropertiesLine prepare_status_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 2;
@@ -380,20 +378,16 @@ int before_schedchange_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;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
 
   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.
@@ -419,8 +413,11 @@ int before_schedchange_hook(void *hook_data, void *call_data)
      * present, it's a new process and it was not present : it will
      * be added after the state update.  */
     LttvProcessState *process;
-    process = lttv_state_find_process(tfs, pid_out);
-    //process = tfs->process;
+    /* unknown state, bad current pid */
+    if(tfs->process->pid != pid_out)
+      process = lttv_state_find_process(tfs, pid_out);
+    else
+      process = tfs->process;
     
     if(process != NULL) {
       /* Well, the process_out existed : we must get it in the process hash
@@ -432,14 +429,12 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       ProcessList *process_list = control_flow_data->process_list;
       LttTime birth = process->creation_time;
       
-      if(processlist_get_process_pixels(process_list,
+      hashed_process_data = processlist_get_process_data(process_list,
               pid_out,
-              process->last_cpu,
+              process->last_cpu_index,
               &birth,
-              tfc->t_context->index,
-              &y,
-              &height,
-              &hashed_process_data) == 1)
+              tfc->t_context->index);
+      if(hashed_process_data == NULL)
       {
         g_assert(pid_out == 0 || pid_out != process->ppid);
         const gchar *name = g_quark_to_string(process->name);
@@ -447,7 +442,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
         ProcessInfo *process_info;
         processlist_add(process_list,
             pid_out,
-            process->last_cpu,
+            process->last_cpu_index,
             process->ppid,
             &birth,
             tfc->t_context->index,
@@ -456,13 +451,12 @@ int before_schedchange_hook(void *hook_data, void *call_data)
             &process_info,
             &hashed_process_data);
         processlist_get_pixels_from_data(process_list,
-                process_info,
                 hashed_process_data,
                 &y,
                 &height);
-        drawing_insert_square( drawing, y, height);
+        drawing_insert_square( control_flow_data->drawing, y, 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.
        */
@@ -477,6 +471,11 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                           evtime) > 0)
       {
         if(hashed_process_data->x.middle_marked == FALSE) {
+           processlist_get_pixels_from_data(process_list,
+                      hashed_process_data,
+                      &y,
+                      &height);
+    
           TimeWindow time_window = 
             lttvwindow_get_time_window(control_flow_data->tab);
 #ifdef EXTRA_CHECK
@@ -484,7 +483,8 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                 || ltt_time_compare(evtime, time_window.end_time) == 1)
                     return;
 #endif //EXTRA_CHECK
-
+          Drawing_t *drawing = control_flow_data->drawing;
+          guint width = drawing->width;
           guint x;
           convert_time_to_pixels(
                     time_window,
@@ -501,14 +501,21 @@ int before_schedchange_hook(void *hook_data, void *call_data)
           hashed_process_data->x.middle_marked = TRUE;
         }
       } else {
-          TimeWindow time_window = 
-            lttvwindow_get_time_window(control_flow_data->tab);
+         processlist_get_pixels_from_data(process_list,
+                      hashed_process_data,
+                      &y,
+                      &height);
+
+        TimeWindow time_window = 
+          lttvwindow_get_time_window(control_flow_data->tab);
 #ifdef EXTRA_CHECK
-          if(ltt_time_compare(evtime, time_window.start_time) == -1
-                || ltt_time_compare(evtime, time_window.end_time) == 1)
-                    return;
+        if(ltt_time_compare(evtime, time_window.start_time) == -1
+              || ltt_time_compare(evtime, time_window.end_time) == 1)
+                  return;
 #endif //EXTRA_CHECK
-
+        Drawing_t *drawing = control_flow_data->drawing;
+        guint width = drawing->width;
         guint x;
         convert_time_to_pixels(
                   time_window,
@@ -592,14 +599,12 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       ProcessList *process_list = control_flow_data->process_list;
       LttTime birth = process->creation_time;
       
-      if(processlist_get_process_pixels(process_list,
+      hashed_process_data = processlist_get_process_data(process_list,
               pid_in,
-              process->last_cpu,
+              process->last_cpu_index,
               &birth,
-              tfc->t_context->index,
-              &y,
-              &height,
-              &hashed_process_data) == 1)
+              tfc->t_context->index);
+      if(hashed_process_data == NULL)
       {
         g_assert(pid_in == 0 || pid_in != process->ppid);
         const gchar *name = g_quark_to_string(process->name);
@@ -607,7 +612,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
         ProcessInfo *process_info;
         processlist_add(process_list,
             pid_in,
-            process->last_cpu,
+            process->last_cpu_index,
             process->ppid,
             &birth,
             tfc->t_context->index,
@@ -616,12 +621,13 @@ int before_schedchange_hook(void *hook_data, void *call_data)
             &process_info,
             &hashed_process_data);
         processlist_get_pixels_from_data(process_list,
-                process_info,
                 hashed_process_data,
                 &y,
                 &height);
-        drawing_insert_square( drawing, y, height);
+        drawing_insert_square( control_flow_data->drawing, y, height);
       }
+      //We could set the current process and hash here, but will be done
+      //by after schedchange hook
     
       /* Now, the process is in the state hash and our own process hash.
        * We definitely can draw the items related to the ending state.
@@ -638,6 +644,11 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                           evtime) > 0)
       {
         if(hashed_process_data->x.middle_marked == FALSE) {
+
+          processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
           TimeWindow time_window = 
             lttvwindow_get_time_window(control_flow_data->tab);
 #ifdef EXTRA_CHECK
@@ -645,6 +656,8 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                 || ltt_time_compare(evtime, time_window.end_time) == 1)
                     return;
 #endif //EXTRA_CHECK
+          Drawing_t *drawing = control_flow_data->drawing;
+          guint width = drawing->width;
           guint x;
           convert_time_to_pixels(
                     time_window,
@@ -661,6 +674,10 @@ int before_schedchange_hook(void *hook_data, void *call_data)
           hashed_process_data->x.middle_marked = TRUE;
         }
       } else {
+        processlist_get_pixels_from_data(process_list,
+                hashed_process_data,
+                &y,
+                &height);
         TimeWindow time_window = 
           lttvwindow_get_time_window(control_flow_data->tab);
 #ifdef EXTRA_CHECK
@@ -668,6 +685,8 @@ int before_schedchange_hook(void *hook_data, void *call_data)
               || ltt_time_compare(evtime, time_window.end_time) == 1)
                   return;
 #endif //EXTRA_CHECK
+        Drawing_t *drawing = control_flow_data->drawing;
+        guint width = drawing->width;
         guint x;
 
         convert_time_to_pixels(
@@ -1362,15 +1381,12 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   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_out, *process_in;
   LttTime birth;
@@ -1393,20 +1409,20 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 
 
   /* Find process pid_in in the list... */
-  process_in = lttv_state_find_process(tfs, pid_in);
+  //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;
 
-  if(processlist_get_process_pixels(process_list,
+  hashed_process_data_in = processlist_get_process_data(process_list,
           pid_in,
-          process_in->last_cpu,
+          process_in->last_cpu_index,
           &birth,
-          tfc->t_context->index,
-          &y_in,
-          &height,
-          &hashed_process_data_in) == 1)
+          tfc->t_context->index);
+  if(hashed_process_data_in == NULL)
   {
     g_assert(pid_in == 0 || pid_in != process_in->ppid);
     const gchar *name = g_quark_to_string(process_in->name);
@@ -1414,7 +1430,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
     /* Process not present */
     processlist_add(process_list,
         pid_in,
-        process_in->last_cpu,
+        process_in->last_cpu_index,
         process_in->ppid,
         &birth,
         tfc->t_context->index,
@@ -1423,16 +1439,22 @@ int after_schedchange_hook(void *hook_data, void *call_data)
         &process_info,
         &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);
   }
+  /* Set the current process */
+  process_list->current_hash_data[process_in->last_cpu_index] =
+                                             hashed_process_data_in;
 
   if(ltt_time_compare(hashed_process_data_in->next_good_time,
                           evtime) <= 0)
   {
+    processlist_get_pixels_from_data(process_list,
+                hashed_process_data_in,
+                &y_in,
+                &height);
     TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -1441,7 +1463,8 @@ int after_schedchange_hook(void *hook_data, void *call_data)
         || ltt_time_compare(evtime, time_window.end_time) == 1)
             return;
 #endif //EXTRA_CHECK
-
+    Drawing_t *drawing = control_flow_data->drawing;
+    guint width = drawing->width;
     guint new_x;
     
     convert_time_to_pixels(
@@ -1913,7 +1936,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 }
 
 #if 0
-static __inline__ PropertiesLine prepare_execmode_line(LttvProcessState *process)
+static inline PropertiesLine prepare_execmode_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 1;
@@ -1968,18 +1991,15 @@ int before_execmode_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;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   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
@@ -1999,36 +2019,40 @@ int before_execmode_hook(void *hook_data, void *call_data)
   HashedProcessData *hashed_process_data = NULL;
   ProcessList *process_list = control_flow_data->process_list;
   LttTime birth = process->creation_time;
-  
-  if(processlist_get_process_pixels(process_list,
+  if(process_list->current_hash_data[tfc->index] != NULL) {
+    hashed_process_data = process_list->current_hash_data[tfc->index];
+  } else {
+    hashed_process_data = processlist_get_process_data(process_list,
+            pid,
+            process->last_cpu_index,
+            &birth,
+            tfc->t_context->index);
+    if(hashed_process_data == NULL)
+    {
+      g_assert(pid == 0 || pid != process->ppid);
+      ProcessInfo *process_info;
+      /* Process not present */
+      const gchar *name = g_quark_to_string(process->name);
+      processlist_add(process_list,
           pid,
-          process->last_cpu,
+          process->last_cpu_index,
+          process->ppid,
           &birth,
           tfc->t_context->index,
-          &y,
-          &height,
-          &hashed_process_data) == 1)
-  {
-    g_assert(pid == 0 || pid != process->ppid);
-    ProcessInfo *process_info;
-    /* Process not present */
-    const gchar *name = g_quark_to_string(process->name);
-    processlist_add(process_list,
-        pid,
-        process->last_cpu,
-        process->ppid,
-        &birth,
-        tfc->t_context->index,
-        name,
-        &pl_height,
-        &process_info,
-        &hashed_process_data);
-    processlist_get_pixels_from_data(process_list,
-                process_info,
-                hashed_process_data,
-                &y,
-                &height);
-    drawing_insert_square( drawing, y, height);
+          name,
+          &pl_height,
+          &process_info,
+          &hashed_process_data);
+      processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
+      drawing_insert_square( control_flow_data->drawing, y, height);
+    }
+    /* Set the current process */
+    process_list->current_hash_data[process->last_cpu_index] =
+                                               hashed_process_data;
   }
 
   /* Now, the process is in the state hash and our own process hash.
@@ -2046,6 +2070,10 @@ int before_execmode_hook(void *hook_data, void *call_data)
                       evtime) > 0)
   {
     if(hashed_process_data->x.middle_marked == FALSE) {
+      processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
       TimeWindow time_window = 
         lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -2054,6 +2082,8 @@ int before_execmode_hook(void *hook_data, void *call_data)
             || ltt_time_compare(evtime, time_window.end_time) == 1)
                 return;
 #endif //EXTRA_CHECK
+      Drawing_t *drawing = control_flow_data->drawing;
+      guint width = drawing->width;
       guint x;
       convert_time_to_pixels(
                 time_window,
@@ -2070,6 +2100,10 @@ int before_execmode_hook(void *hook_data, void *call_data)
       hashed_process_data->x.middle_marked = TRUE;
     }
   } else {
+    processlist_get_pixels_from_data(process_list,
+                hashed_process_data,
+                &y,
+                &height);
     TimeWindow time_window = 
       lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -2078,6 +2112,8 @@ int before_execmode_hook(void *hook_data, void *call_data)
           || ltt_time_compare(evtime, time_window.end_time) == 1)
               return;
 #endif //EXTRA_CHECK
+    Drawing_t *drawing = control_flow_data->drawing;
+    guint width = drawing->width;
     guint x;
 
     convert_time_to_pixels(
@@ -2155,19 +2191,23 @@ int before_execmode_hook(void *hook_data, void *call_data)
  */
 int after_execmode_hook(void *hook_data, void *call_data)
 {
+  /**************** DOES NOTHING!! *************/
+  /* hook desactivated in drawing.c */
+  return 0;
+
+
+
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
 
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   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;
@@ -2186,40 +2226,50 @@ int after_execmode_hook(void *hook_data, void *call_data)
 
   birth = process->creation_time;
 
-  if(processlist_get_process_pixels(process_list,
+  if(process_list->current_hash_data[tfc->index] != NULL) {
+    hashed_process_data = process_list->current_hash_data[tfc->index];
+  } else {
+    hashed_process_data = processlist_get_process_data(process_list,
+            pid,
+            process->last_cpu_index,
+            &birth,
+            tfc->t_context->index);
+    if(hashed_process_data == NULL)
+    {
+      g_assert(pid == 0 || pid != process->ppid);
+      /* Process not present */
+      const gchar *name = g_quark_to_string(process->name);
+      ProcessInfo *process_info;
+      processlist_add(process_list,
           pid,
-          process->last_cpu,
+          process->last_cpu_index,
+          process->ppid,
           &birth,
           tfc->t_context->index,
-          &y,
-          &height,
-          &hashed_process_data) == 1)
+          name,
+          &pl_height,
+          &process_info,
+          &hashed_process_data);
+      processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
+      drawing_insert_square( control_flow_data->drawing, y, height);
+    }
+    /* Set the current process */
+    process_list->current_hash_data[process->last_cpu_index] =
+                                               hashed_process_data;
+  }
+
+  if(ltt_time_compare(hashed_process_data->next_good_time,
+                          evtime) <= 0)
   {
-    g_assert(pid == 0 || pid != process->ppid);
-    /* Process not present */
-    const gchar *name = g_quark_to_string(process->name);
-    ProcessInfo *process_info;
-    processlist_add(process_list,
-        pid,
-        process->last_cpu,
-        process->ppid,
-        &birth,
-        tfc->t_context->index,
-        name,
-        &pl_height,
-        &process_info,
-        &hashed_process_data);
+#if 0
     processlist_get_pixels_from_data(process_list,
-                process_info,
                 hashed_process_data,
                 &y,
                 &height);
-    drawing_insert_square( control_flow_data->drawing, y, height);
-  }
-  
-  if(ltt_time_compare(hashed_process_data->next_good_time,
-                          evtime) <= 0)
-  {
+#endif //0
     TimeWindow time_window = 
       lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -2228,8 +2278,8 @@ int after_execmode_hook(void *hook_data, void *call_data)
           || ltt_time_compare(evtime, time_window.end_time) == 1)
               return;
 #endif //EXTRA_CHECK
-
-
+    Drawing_t *drawing = control_flow_data->drawing;
+    guint width = drawing->width;
     guint new_x;
     
     convert_time_to_pixels(
@@ -2263,18 +2313,15 @@ int before_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;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  guint width = control_flow_data->drawing->width;
 
   guint sub_id;
   {
@@ -2299,35 +2346,36 @@ int before_process_hook(void *hook_data, void *call_data)
 
     birth = process->creation_time;
 
-    if(processlist_get_process_pixels(process_list,
+    if(process_list->current_hash_data[tfc->index] != NULL) {
+      hashed_process_data = process_list->current_hash_data[tfc->index];
+    } else {
+      hashed_process_data = processlist_get_process_data(process_list,
+            pid,
+            process->last_cpu_index,
+            &birth,
+            tfc->t_context->index);
+      if(hashed_process_data == NULL)
+      {
+        g_assert(pid == 0 || pid != process->ppid);
+        /* Process not present */
+        const gchar *name = g_quark_to_string(process->name);
+        ProcessInfo *process_info;
+        processlist_add(process_list,
             pid,
-            process->last_cpu,
+            process->last_cpu_index,
+            process->ppid,
             &birth,
             tfc->t_context->index,
-            &y,
-            &height,
-            &hashed_process_data) == 1)
-    {
-      g_assert(pid == 0 || pid != process->ppid);
-      /* Process not present */
-      const gchar *name = g_quark_to_string(process->name);
-      ProcessInfo *process_info;
-      processlist_add(process_list,
-          pid,
-          process->last_cpu,
-          process->ppid,
-          &birth,
-          tfc->t_context->index,
-          name,
-          &pl_height,
-          &process_info,
-          &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);
+            name,
+            &pl_height,
+            &process_info,
+            &hashed_process_data);
+        processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
+        drawing_insert_square( control_flow_data->drawing, y, height);
+      }
     }
 
     /* Now, the process is in the state hash and our own process hash.
@@ -2345,6 +2393,10 @@ int before_process_hook(void *hook_data, void *call_data)
                         evtime) > 0)
     {
       if(hashed_process_data->x.middle_marked == FALSE) {
+        processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
         TimeWindow time_window = 
           lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -2353,7 +2405,8 @@ int before_process_hook(void *hook_data, void *call_data)
               || ltt_time_compare(evtime, time_window.end_time) == 1)
                   return;
 #endif //EXTRA_CHECK
-
+        Drawing_t *drawing = control_flow_data->drawing;
+        guint width = drawing->width;
         guint x;
         convert_time_to_pixels(
                   time_window,
@@ -2370,15 +2423,20 @@ int before_process_hook(void *hook_data, void *call_data)
         hashed_process_data->x.middle_marked = TRUE;
       }
     } else {
-    TimeWindow time_window = 
-      lttvwindow_get_time_window(control_flow_data->tab);
+      processlist_get_pixels_from_data(process_list,
+                hashed_process_data,
+                &y,
+                &height);
+      TimeWindow time_window = 
+        lttvwindow_get_time_window(control_flow_data->tab);
 
 #ifdef EXTRA_CHECK
-    if(ltt_time_compare(evtime, time_window.start_time) == -1
-          || ltt_time_compare(evtime, time_window.end_time) == 1)
-              return;
+      if(ltt_time_compare(evtime, time_window.start_time) == -1
+            || ltt_time_compare(evtime, time_window.end_time) == 1)
+                return;
 #endif //EXTRA_CHECK
-
+      Drawing_t *drawing = control_flow_data->drawing;
+      guint width = drawing->width;
       guint x;
 
       convert_time_to_pixels(
@@ -2470,13 +2528,11 @@ int after_process_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
-  LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context;
 
   LttEvent *e;
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  guint width = control_flow_data->drawing->width;
 
   guint sub_id;
   guint param1;
@@ -2507,14 +2563,12 @@ int after_process_hook(void *hook_data, void *call_data)
 
     birth = process_child->creation_time;
 
-    if(processlist_get_process_pixels(process_list,
+    hashed_process_data_child = processlist_get_process_data(process_list,
             child_pid,
-            process_child->last_cpu,
+            process_child->last_cpu_index,
             &birth,
-            tfc->t_context->index,
-            &y_child,
-            &height,
-            &hashed_process_data_child) == 1)
+            tfc->t_context->index);
+    if(hashed_process_data_child == NULL)
     {
       g_assert(child_pid == 0 || child_pid != process_child->ppid);
       /* Process not present */
@@ -2522,7 +2576,7 @@ int after_process_hook(void *hook_data, void *call_data)
       ProcessInfo *process_info;
       processlist_add(process_list,
           child_pid,
-          process_child->last_cpu,
+          process_child->last_cpu_index,
           process_child->ppid,
           &birth,
           tfc->t_context->index,
@@ -2531,16 +2585,22 @@ int after_process_hook(void *hook_data, void *call_data)
           &process_info,
           &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);
     }
 
+
     if(ltt_time_compare(hashed_process_data_child->next_good_time,
                           evtime) <= 0)
     {
+#if 0
+      processlist_get_pixels_from_data(process_list,
+                hashed_process_data_child,
+                &y_child,
+                &height);
+#endif //0
       TimeWindow time_window = 
         lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -2549,7 +2609,8 @@ int after_process_hook(void *hook_data, void *call_data)
             || ltt_time_compare(evtime, time_window.end_time) == 1)
                 return;
 #endif //EXTRA_CHECK
-
+      Drawing_t *drawing = control_flow_data->drawing;
+      guint width = drawing->width;
       guint new_x;
       convert_time_to_pixels(
           time_window,
@@ -2590,40 +2651,51 @@ int after_process_hook(void *hook_data, void *call_data)
 
     birth = process->creation_time;
 
-    if(processlist_get_process_pixels(process_list,
+    if(process_list->current_hash_data[tfc->index] != NULL) {
+      hashed_process_data = process_list->current_hash_data[tfc->index];
+    } else {
+      hashed_process_data = processlist_get_process_data(process_list,
+              pid,
+              process->last_cpu_index,
+              &birth,
+              tfc->t_context->index);
+      if(hashed_process_data == NULL)
+      {
+        g_assert(pid == 0 || pid != process->ppid);
+        /* Process not present */
+        const gchar *name = g_quark_to_string(process->name);
+        ProcessInfo *process_info;
+        processlist_add(process_list,
             pid,
-            process->last_cpu,
+            process->last_cpu_index,
+            process->ppid,
             &birth,
             tfc->t_context->index,
-            &y,
-            &height,
-            &hashed_process_data) == 1)
-    {
-      g_assert(pid == 0 || pid != process->ppid);
-      /* Process not present */
-      const gchar *name = g_quark_to_string(process->name);
-      ProcessInfo *process_info;
-      processlist_add(process_list,
-          pid,
-          process->last_cpu,
-          process->ppid,
-          &birth,
-          tfc->t_context->index,
-          name,
-          &pl_height,
-          &process_info,
-          &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);
+            name,
+            &pl_height,
+            &process_info,
+            &hashed_process_data);
+        processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
+        drawing_insert_square( control_flow_data->drawing, y, height);
+      }
+
+      /* Set the current process */
+      process_list->current_hash_data[process->last_cpu_index] =
+                                               hashed_process_data;
     }
 
     if(ltt_time_compare(hashed_process_data->next_good_time,
                           evtime) <= 0)
     {
+#if 0
+      processlist_get_pixels_from_data(process_list,
+                hashed_process_data,
+                &y,
+                &height);
+#endif //0
       TimeWindow time_window = 
         lttvwindow_get_time_window(control_flow_data->tab);
 
@@ -2632,7 +2704,8 @@ int after_process_hook(void *hook_data, void *call_data)
             || ltt_time_compare(evtime, time_window.end_time) == 1)
                 return;
 #endif //EXTRA_CHECK
-
+      Drawing_t *drawing = control_flow_data->drawing;
+      guint width = drawing->width;
       guint new_x;
       convert_time_to_pixels(
           time_window,
@@ -3065,13 +3138,11 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
     
   EventsRequest *events_request = closure_data->events_request;
   ControlFlowData *control_flow_data = events_request->viewer_data;
-  Drawing_t *drawing = control_flow_data->drawing;
 
   LttvTracesetState *tss = closure_data->tss;
-  LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss;
+  LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
 
   LttTime evtime = closure_data->end_time;
-  guint width = drawing->width;
 
   { 
     /* For the process */
@@ -3104,11 +3175,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
       if(control_flow_data->background_info_waiting==0)
         g_assert(ltt_time_compare(process->creation_time,
                                   process_info->birth) == 0);
-      const gchar *name = g_quark_to_string(process->name);
-      
       /* process HAS to be present */
       processlist_get_pixels_from_data(process_list,
-              process_info,
               hashed_process_data,
               &y,
               &height);
@@ -3135,6 +3203,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
               || ltt_time_compare(evtime, time_window.end_time) == 1)
                   return;
 #endif //EXTRA_CHECK
+        Drawing_t *drawing = control_flow_data->drawing;
+        guint width = drawing->width;
         guint x;
 
         convert_time_to_pixels(
@@ -3284,6 +3354,9 @@ int after_chunk(void *hook_data, void *call_data)
   
   ProcessList *process_list = control_flow_data->process_list;
 
+  g_free(process_list->current_hash_data);
+  process_list->current_hash_data = NULL;
+  
   if(tfc != NULL)
     end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);
   else /* end of traceset, or position now out of request : end */
This page took 0.034959 seconds and 4 git commands to generate.