keep current process : y position shorter to find

git-svn-id: http://ltt.polymtl.ca/svn@748 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index bcda5b22f0a1babaf03af4222393d909819b0c5e..f9fca3e7b428491b11150584a33039052fc325ce 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -18,6 +18,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <string.h>
 
 #include <lttv/lttv.h>
 #include <lttv/tracecontext.h>
@@ -413,9 +414,6 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
   g_hash_table_foreach(cfd->process_list->process_hash, set_last_start,
                             (gpointer)x);
 
-  cfd->process_list->current_process_info = NULL;
-  cfd->process_list->current_hash_data = NULL;
-
 }
 
 void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
@@ -424,7 +422,12 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
   ControlFlowData *cfd = events_request->viewer_data;
   LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
   LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
+  guint num_cpu = 
+    ltt_trace_per_cpu_tracefile_number(tss->parent.traces[TRACE_NUMBER]->t);
 
+  cfd->process_list->current_hash_data = g_new(HashedProcessData*,num_cpu);
+  memset(cfd->process_list->current_hash_data, 0,
+         sizeof(HashedProcessData*)*num_cpu);
   //cfd->drawing->last_start = LTT_TIME_MIN(current_time,
   //                                        events_request->end_time);
 }

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 5c828c284dfaf5a18970968289aff23d040ea3a2..fc4e2caa4724518e1de10f5fb0c8a04a360af122 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -419,8 +419,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
@@ -434,7 +437,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       
       if(processlist_get_process_pixels(process_list,
               pid_out,
-              process->last_cpu,
+              process->last_cpu_index,
               &birth,
               tfc->t_context->index,
               &y,
@@ -447,7 +450,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,7 +459,6 @@ 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);
@@ -594,7 +596,7 @@ int before_schedchange_hook(void *hook_data, void *call_data)
       
       if(processlist_get_process_pixels(process_list,
               pid_in,
-              process->last_cpu,
+              process->last_cpu_index,
               &birth,
               tfc->t_context->index,
               &y,
@@ -607,7 +609,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 +618,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);
       }
+      //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.
@@ -1393,7 +1396,8 @@ 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. */
   g_assert(process_in != NULL);
 
@@ -1401,7 +1405,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 
   if(processlist_get_process_pixels(process_list,
           pid_in,
-          process_in->last_cpu,
+          process_in->last_cpu_index,
           &birth,
           tfc->t_context->index,
           &y_in,
@@ -1414,7 +1418,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,12 +1427,14 @@ 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)
@@ -1999,36 +2005,46 @@ 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,
-          pid,
-          process->last_cpu,
-          &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);
+ 
+  if(process_list->current_hash_data[tfc->index] != NULL) {
+    hashed_process_data = process_list->current_hash_data[tfc->index];
     processlist_get_pixels_from_data(process_list,
-                process_info,
                 hashed_process_data,
                 &y,
                 &height);
-    drawing_insert_square( drawing, y, height);
+  } else {
+    if(processlist_get_process_pixels(process_list,
+            pid,
+            process->last_cpu_index,
+            &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_index,
+          process->ppid,
+          &birth,
+          tfc->t_context->index,
+          name,
+          &pl_height,
+          &process_info,
+          &hashed_process_data);
+      processlist_get_pixels_from_data(process_list,
+                  hashed_process_data,
+                  &y,
+                  &height);
+      drawing_insert_square( 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.
@@ -2186,37 +2202,47 @@ int after_execmode_hook(void *hook_data, void *call_data)
 
   birth = process->creation_time;
 
-  if(processlist_get_process_pixels(process_list,
-          pid,
-          process->last_cpu,
-          &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);
+  if(process_list->current_hash_data[tfc->index] != NULL) {
+    hashed_process_data = process_list->current_hash_data[tfc->index];
     processlist_get_pixels_from_data(process_list,
-                process_info,
                 hashed_process_data,
                 &y,
                 &height);
-    drawing_insert_square( control_flow_data->drawing, y, height);
+  } else {
+    if(processlist_get_process_pixels(process_list,
+            pid,
+            process->last_cpu_index,
+            &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_index,
+          process->ppid,
+          &birth,
+          tfc->t_context->index,
+          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)
   {
@@ -2299,9 +2325,15 @@ 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];
+      processlist_get_pixels_from_data(process_list,
+                hashed_process_data,
+                &y,
+                &height);
+    } else  if(processlist_get_process_pixels(process_list,
             pid,
-            process->last_cpu,
+            process->last_cpu_index,
             &birth,
             tfc->t_context->index,
             &y,
@@ -2314,7 +2346,7 @@ int before_process_hook(void *hook_data, void *call_data)
       ProcessInfo *process_info;
       processlist_add(process_list,
           pid,
-          process->last_cpu,
+          process->last_cpu_index,
           process->ppid,
           &birth,
           tfc->t_context->index,
@@ -2323,7 +2355,6 @@ int before_process_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);
@@ -2509,7 +2540,7 @@ int after_process_hook(void *hook_data, void *call_data)
 
     if(processlist_get_process_pixels(process_list,
             child_pid,
-            process_child->last_cpu,
+            process_child->last_cpu_index,
             &birth,
             tfc->t_context->index,
             &y_child,
@@ -2522,7 +2553,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,13 +2562,13 @@ 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)
     {
@@ -2590,35 +2621,47 @@ int after_process_hook(void *hook_data, void *call_data)
 
     birth = process->creation_time;
 
-    if(processlist_get_process_pixels(process_list,
-            pid,
-            process->last_cpu,
-            &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);
+    if(process_list->current_hash_data[tfc->index] != NULL) {
+      hashed_process_data = process_list->current_hash_data[tfc->index];
       processlist_get_pixels_from_data(process_list,
-                process_info,
                 hashed_process_data,
                 &y,
                 &height);
-      drawing_insert_square( control_flow_data->drawing, y, height);
+      
+    } else {
+      if(processlist_get_process_pixels(process_list,
+              pid,
+              process->last_cpu_index,
+              &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_index,
+            process->ppid,
+            &birth,
+            tfc->t_context->index,
+            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,
@@ -3104,11 +3147,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);
@@ -3284,6 +3324,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 */

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
index 11b838a1af851a2af68b244cbcbf9dc4bb6395b8..9fc871d862d57d24308c0f54760811be9b24e715 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
@@ -32,7 +32,7 @@
  *                       Methods to synchronize process list                 *
  *****************************************************************************/
 
-static __inline__ guint get_cpu_number_from_name(GQuark name);
+//static __inline__ guint get_cpu_number_from_name(GQuark name);
   
 /* Enumeration of the columns */
 enum
@@ -279,7 +279,6 @@ ProcessList *processlist_construct(void)
   process_list->number_of_process = 0;
   process_list->cell_height_cache = -1;
 
-  process_list->current_process_info = NULL;
   process_list->current_hash_data = NULL;
 
   /* Create the Process list */
@@ -417,10 +416,8 @@ static gboolean remove_hash_item(ProcessInfo *process_info,
 
   gtk_list_store_remove (process_list->list_store, &iter);
 
-  if(process_info == process_list->current_process_info)
-    process_list->current_process_info = NULL;
-  if(hashed_process_data == process_list->current_hash_data)
-    process_list->current_hash_data = NULL;
+  if(hashed_process_data == process_list->current_hash_data[process_info->cpu])
+    process_list->current_hash_data[process_info->cpu] = NULL;
 
   return TRUE; /* remove the element from the hash table */
 }
@@ -518,7 +515,7 @@ int processlist_add(  ProcessList *process_list,
         PROCESS_COLUMN, name,
         PID_COLUMN, pid,
         PPID_COLUMN, ppid,
-        CPU_COLUMN, get_cpu_number_from_name(cpu),
+        CPU_COLUMN, cpu,
         BIRTH_S_COLUMN, birth->tv_sec,
         BIRTH_NS_COLUMN, birth->tv_nsec,
         TRACE_COLUMN, trace_num,
@@ -579,9 +576,8 @@ int processlist_remove( ProcessList *process_list,
     g_hash_table_remove(process_list->process_hash,
         &process_info);
 
-    if(hashed_process_data == process_list->current_hash_data) {
-      process_list->current_process_info = NULL;
-      process_list->current_hash_data = NULL;
+    if(hashed_process_data == process_list->current_hash_data[cpu]) {
+      process_list->current_hash_data[cpu] = NULL;
     }
 
     process_list->number_of_process--;
@@ -646,7 +642,6 @@ __inline__ gint processlist_get_process_pixels(  ProcessList *process_list,
 
 
 __inline__ gint processlist_get_pixels_from_data(  ProcessList *process_list,
-          ProcessInfo *process_info,
           HashedProcessData *hashed_process_data,
           guint *y,
           guint *height)
@@ -667,6 +662,7 @@ __inline__ gint processlist_get_pixels_from_data(  ProcessList *process_list,
 
 }
 
+#if 0
 static __inline__ guint get_cpu_number_from_name(GQuark name)
 {
   const gchar *string;
@@ -684,4 +680,4 @@ static __inline__ guint get_cpu_number_from_name(GQuark name)
 
   return cpu;
 }
-
+#endif //0

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
index c1fccc3e8f9c2dd49440376ae624beb5f0abd12d..1685c76409f490caefc5653c0d0be8ee8615baf2 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
@@ -44,7 +44,7 @@
 typedef struct _ProcessInfo {
   
   guint pid;
-  GQuark cpu; /* only for PID 0 */
+  guint cpu;
   guint ppid;
   LttTime birth;
   guint trace_num;
@@ -88,9 +88,8 @@ struct _ProcessList {
   guint number_of_process;
   gint cell_height_cache;
 
-  /* FIXME : those current process must be one per CPU !! */
-  ProcessInfo *current_process_info;
-  HashedProcessData *current_hash_data;
+  /* Current process, one per cpu */
+  HashedProcessData **current_hash_data;
 
 };
 
@@ -122,7 +121,6 @@ __inline__ gint processlist_get_process_pixels(ProcessList *process_list,
         HashedProcessData **hashed_process_data);
 
 __inline__ gint processlist_get_pixels_from_data(  ProcessList *process_list,
-          ProcessInfo *process_info,
           HashedProcessData *hashed_process_data,
           guint *y,
           guint *height);