warning fixed for lttvwindow and controlflow view

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / processlist.h

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
index 13af79c33c9686eb4cd79eccc97b9f125784161f..03da021d79015711b7c1dcb1ab35ce18b6b0fe43 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,8 +88,8 @@ struct _ProcessList {
   guint number_of_process;
   gint cell_height_cache;
 
-  ProcessInfo *current_process_info;
-  HashedProcessData *current_hash_data;
+  /* Current process, one per cpu */
+  HashedProcessData **current_hash_data;
 
 };
 
@@ -112,18 +112,75 @@ int processlist_add(ProcessList *process_list, guint pid, guint cpu, guint ppid,
 int processlist_remove(ProcessList *process_list, guint pid, guint cpu, 
     LttTime *birth, guint trace_num);
 
-guint processlist_get_height(ProcessList *process_list);
 
-// Returns 0 on success
-__inline gint processlist_get_process_pixels(ProcessList *process_list,
-        guint pid, guint cpu, LttTime *birth, guint trace_num,
-        guint *y, guint *height,
-        HashedProcessData **hashed_process_data);
 
-__inline gint processlist_get_pixels_from_data(  ProcessList *process_list,
-          ProcessInfo *process_info,
+
+
+static inline gint get_cell_height(ProcessList *process_list,
+                                   GtkTreeView *tree_view)
+{
+  gint height = process_list->cell_height_cache;
+  if(height != -1) return height;
+  else {
+    GtkTreeViewColumn *Column = gtk_tree_view_get_column(tree_view, 0);
+  
+    gtk_tree_view_column_cell_get_size(Column, NULL, NULL, NULL, NULL,
+                                       &process_list->cell_height_cache);
+  }
+  return process_list->cell_height_cache;
+}
+
+
+
+static inline guint processlist_get_height(ProcessList *process_list)
+{
+  return get_cell_height(process_list,
+                         (GtkTreeView*)process_list->process_list_widget)
+        * process_list->number_of_process ;
+}
+
+
+static inline HashedProcessData *processlist_get_process_data( 
+          ProcessList *process_list,
+          guint pid, guint cpu, LttTime *birth, guint trace_num)
+{
+  ProcessInfo process_info;
+
+  process_info.pid = pid;
+  if(pid == 0)
+    process_info.cpu = cpu;
+  else
+    process_info.cpu = 0;
+  process_info.birth = *birth;
+  process_info.trace_num = trace_num;
+
+  return  (HashedProcessData*)g_hash_table_lookup(
+                process_list->process_hash,
+                &process_info);
+}
+
+
+static inline gint processlist_get_pixels_from_data(  ProcessList *process_list,
           HashedProcessData *hashed_process_data,
           guint *y,
-          guint *height);
+          guint *height)
+{
+  gint *path_indices;
+  GtkTreePath *tree_path;
+
+  tree_path = gtk_tree_model_get_path((GtkTreeModel*)process_list->list_store,
+                    &hashed_process_data->y_iter);
+  path_indices =  gtk_tree_path_get_indices (tree_path);
+
+  *height = get_cell_height(process_list,
+      (GtkTreeView*)process_list->process_list_widget);
+  *y = *height * path_indices[0];
+  gtk_tree_path_free(tree_path);
+
+  return 0; 
+
+}
+
+
 
 #endif // _PROCESS_LIST_H