X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fresourceview%2Fprocesslist.c;h=cb4c7a7a0972a1257248591ee9549a4fbf75dd75;hb=4d4528813f83afd049d937aea321b10f9598185e;hp=3495202cc735d68de9165aba8e3e3ba4dcd12f44;hpb=67f729732d629426de5a04965a81f6f0848af053;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/resourceview/processlist.c b/ltt/branches/poly/lttv/modules/gui/resourceview/processlist.c
index 3495202c..cb4c7a7a 100644
--- a/ltt/branches/poly/lttv/modules/gui/resourceview/processlist.c
+++ b/ltt/branches/poly/lttv/modules/gui/resourceview/processlist.c
@@ -59,7 +59,7 @@ gint resource_sort_func  ( GtkTreeModel *model,
 
 static guint ru_numeric_hash_fct(gconstpointer key)
 {
-  ResourceUniqueNumeric *ru = (const ResourceUniqueNumeric *)key;
+  ResourceUniqueNumeric *ru = (ResourceUniqueNumeric *)key;
   int tmp = (ru->trace_num << 8) ^ ru->id;
 
   return g_int_hash(&tmp);
@@ -139,7 +139,7 @@ void update_index_to_pixmap(ProcessList *process_list)
   arg.count = 0;
   arg.process_list = process_list;
 
-  gtk_tree_model_foreach(process_list->list_store,
+  gtk_tree_model_foreach(GTK_TREE_MODEL(process_list->list_store),
       (GtkTreeModelForeachFunc)update_index_to_pixmap_each, &arg);
 }
 
@@ -298,7 +298,13 @@ ProcessList *processlist_construct(void)
   process_list->process_list_widget = 
     gtk_tree_view_new_with_model
     (GTK_TREE_MODEL (process_list->list_store));
-  g_object_set(process_list->process_list_widget, "enable-tree-lines", TRUE, NULL);
+
+  gtk_tree_view_set_show_expanders(
+    GTK_TREE_VIEW(process_list->process_list_widget), FALSE);
+  gtk_tree_view_set_level_indentation(
+    process_list->process_list_widget, 20);
+  
+  gtk_tree_view_set_enable_tree_lines(process_list->process_list_widget, TRUE);
 
   g_object_unref (G_OBJECT (process_list->list_store));
 
@@ -308,7 +314,6 @@ ProcessList *processlist_construct(void)
       NULL,
       NULL);
  
-
   gtk_tree_sortable_set_sort_column_id(
       GTK_TREE_SORTABLE(process_list->list_store),
       GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
@@ -367,8 +372,9 @@ ProcessList *processlist_construct(void)
   process_list->restypes[RV_RESOURCE_MACHINE].hash_table = g_hash_table_new(ru_numeric_hash_fct, ru_numeric_equ_fct);
   process_list->restypes[RV_RESOURCE_CPU].hash_table = g_hash_table_new(ru_numeric_hash_fct, ru_numeric_equ_fct);
   process_list->restypes[RV_RESOURCE_IRQ].hash_table = g_hash_table_new(ru_numeric_hash_fct, ru_numeric_equ_fct);
+  process_list->restypes[RV_RESOURCE_SOFT_IRQ].hash_table = g_hash_table_new(ru_numeric_hash_fct, ru_numeric_equ_fct);
   process_list->restypes[RV_RESOURCE_BDEV].hash_table = g_hash_table_new(ru_numeric_hash_fct, ru_numeric_equ_fct);
-  
+
   return process_list;
 }
 
@@ -440,86 +446,55 @@ void destroy_hash_data(gpointer data)
   g_free(data);
 }
 
-HashedResourceData *resourcelist_obtain_machine(ControlFlowData *resourceview_data, guint trace_num, guint id)
+GQuark make_cpu_name(ControlFlowData *resourceview_data, guint trace_num, guint id)
 {
-  ResourceUniqueNumeric *ru = g_new(ResourceUniqueNumeric, 1);
-  HashedResourceData *data = g_new(HashedResourceData, 1);
-  
-  /* Prepare hash key */
-  ru->trace_num = trace_num;
-  ru->id = id;
-  
-  /* Search within hash table */
-  GHashTable *ht = resourceview_data->process_list->restypes[RV_RESOURCE_MACHINE].hash_table;
-  data = g_hash_table_lookup(ht, ru);
-  
-  /* If not found in hash table, add it */
-  if(data == NULL) {
-    GQuark name;
+  GQuark name;
+  gchar *str;
 
-    data = g_malloc(sizeof(HashedResourceData));
-    /* Prepare hashed data */
-    data->type = RV_RESOURCE_MACHINE;
-    data->x.over = 0;
-    data->x.over_used = FALSE;
-    data->x.over_marked = FALSE;
-    data->x.middle = 0; // last 
-    data->x.middle_used = FALSE;
-    data->x.middle_marked = FALSE;
-    data->x.under = 0;
-    data->x.under_used = FALSE;
-    data->x.under_marked = FALSE;
-    data->next_good_time = ltt_time_zero;
-
-    data->height = resourceview_data->process_list->cell_height;
-    data->pixmap = 
-        gdk_pixmap_new(resourceview_data->drawing->drawing_area->window,
-                       resourceview_data->drawing->alloc_width,
-                       data->height,
-                       -1);
-    g_assert(data->pixmap);
+  str = g_strdup_printf("CPU%u", id);
+  name = g_quark_from_string(str);
+  g_free(str);
 
-    gdk_draw_rectangle (data->pixmap,
-        resourceview_data->drawing->drawing_area->style->black_gc,
-        TRUE,
-        0, 0,
-        resourceview_data->drawing->alloc_width,
-        data->height);
+  return name;
+}
 
-    /* add to hash table */
-    g_hash_table_insert(ht, ru, data);
-    resourceview_data->process_list->number_of_process++; // TODO: check
+GQuark make_irq_name(ControlFlowData *resourceview_data, guint trace_num, guint id)
+{
+  GQuark name;
+  gchar *str;
 
-    /* add to process list */
-    {
-      gchar *str;
-      str = g_strdup_printf("Trace %u", id);
-      name = g_quark_from_string(str);
-      g_free(str);
-    }
+  str = g_strdup_printf("IRQ %u", id);
+  name = g_quark_from_string(str);
+  g_free(str);
 
-    gtk_tree_store_append(resourceview_data->process_list->list_store, &data->y_iter, NULL);
-    gtk_tree_store_set(resourceview_data->process_list->list_store, &data->y_iter,
-         NAME_COLUMN, g_quark_to_string(name), DATA_COLUMN, data,
-         -1);
+  return name;
+}
 
-    update_index_to_pixmap(resourceview_data->process_list);
+GQuark make_soft_irq_name(ControlFlowData *resourceview_data, guint trace_num, guint id)
+{
+  GQuark name;
+  gchar *str;
 
-    int heightall = data->height * resourceview_data->process_list->number_of_process;
+  str = g_strdup_printf("SOFTIRQ %u", id);
+  name = g_quark_from_string(str);
+  g_free(str);
 
-    gtk_widget_set_size_request(resourceview_data->drawing->drawing_area,
-                              -1,
-                              heightall);
+  return name;
+}
 
-    gtk_widget_queue_draw(resourceview_data->drawing->drawing_area);
-  }
+GQuark make_bdev_name(ControlFlowData *resourceview_data, guint trace_num, guint id)
+{
+  GQuark name;
+  gchar *str;
 
-  gtk_tree_view_expand_all(resourceview_data->process_list->process_list_widget);
+  str = g_strdup_printf("Block (%u,%u)", MAJOR(id), MINOR(id));
+  name = g_quark_from_string(str);
+  g_free(str);
 
-  return data;
+  return name;
 }
 
-HashedResourceData *resourcelist_obtain_cpu(ControlFlowData *resourceview_data, guint trace_num, guint id)
+HashedResourceData *resourcelist_obtain_machine(ControlFlowData *resourceview_data, guint trace_num, guint id)
 {
   ResourceUniqueNumeric *ru = g_new(ResourceUniqueNumeric, 1);
   HashedResourceData *data = g_new(HashedResourceData, 1);
@@ -529,21 +504,16 @@ HashedResourceData *resourcelist_obtain_cpu(ControlFlowData *resourceview_data,
   ru->id = id;
   
   /* Search within hash table */
-  GHashTable *ht = resourceview_data->process_list->restypes[RV_RESOURCE_CPU].hash_table;
+  GHashTable *ht = resourceview_data->process_list->restypes[RV_RESOURCE_MACHINE].hash_table;
   data = g_hash_table_lookup(ht, ru);
   
   /* If not found in hash table, add it */
   if(data == NULL) {
     GQuark name;
-    HashedResourceData *parent;
 
-    /* Find the parent machine */
-    parent = resourcelist_obtain_machine(resourceview_data, trace_num, trace_num);
-
-    /* Prepare hashed data */
     data = g_malloc(sizeof(HashedResourceData));
-
-    data->type = RV_RESOURCE_CPU;
+    /* Prepare hashed data */
+    data->type = RV_RESOURCE_MACHINE;
     data->x.over = 0;
     data->x.over_used = FALSE;
     data->x.over_marked = FALSE;
@@ -561,6 +531,7 @@ HashedResourceData *resourcelist_obtain_cpu(ControlFlowData *resourceview_data,
                        resourceview_data->drawing->alloc_width,
                        data->height,
                        -1);
+    g_assert(data->pixmap);
 
     gdk_draw_rectangle (data->pixmap,
         resourceview_data->drawing->drawing_area->style->black_gc,
@@ -576,12 +547,12 @@ HashedResourceData *resourcelist_obtain_cpu(ControlFlowData *resourceview_data,
     /* add to process list */
     {
       gchar *str;
-      str = g_strdup_printf("CPU%u", id);
+      str = g_strdup_printf("Trace %u", id);
       name = g_quark_from_string(str);
       g_free(str);
     }
 
-    gtk_tree_store_append(resourceview_data->process_list->list_store, &data->y_iter, &parent->y_iter);
+    gtk_tree_store_append(resourceview_data->process_list->list_store, &data->y_iter, NULL);
     gtk_tree_store_set(resourceview_data->process_list->list_store, &data->y_iter,
          NAME_COLUMN, g_quark_to_string(name), DATA_COLUMN, data,
          -1);
@@ -597,10 +568,12 @@ HashedResourceData *resourcelist_obtain_cpu(ControlFlowData *resourceview_data,
     gtk_widget_queue_draw(resourceview_data->drawing->drawing_area);
   }
 
+  gtk_tree_view_expand_all(GTK_TREE_VIEW(resourceview_data->process_list->process_list_widget));
+
   return data;
 }
 
-HashedResourceData *resourcelist_obtain_irq(ControlFlowData *resourceview_data, guint trace_num, guint id)
+HashedResourceData *resourcelist_obtain_generic(ControlFlowData *resourceview_data, gint res_type, guint trace_num, guint id, GQuark (*make_name_func)(ControlFlowData *resourceview_data, guint trace_num, guint id))
 {
   ResourceUniqueNumeric *ru = g_new(ResourceUniqueNumeric, 1);
   HashedResourceData *data = g_new(HashedResourceData, 1);
@@ -610,7 +583,7 @@ HashedResourceData *resourcelist_obtain_irq(ControlFlowData *resourceview_data,
   ru->id = id;
   
   /* Search within hash table */
-  GHashTable *ht = resourceview_data->process_list->restypes[RV_RESOURCE_IRQ].hash_table;
+  GHashTable *ht = resourceview_data->process_list->restypes[res_type].hash_table;
   data = g_hash_table_lookup(ht, ru);
   
   /* If not found in hash table, add it */
@@ -624,7 +597,7 @@ HashedResourceData *resourcelist_obtain_irq(ControlFlowData *resourceview_data,
     /* Prepare hashed data */
     data = g_malloc(sizeof(HashedResourceData));
 
-    data->type = RV_RESOURCE_IRQ;
+    data->type = res_type;
     data->x.over = 0;
     data->x.over_used = FALSE;
     data->x.over_marked = FALSE;
@@ -655,12 +628,7 @@ HashedResourceData *resourcelist_obtain_irq(ControlFlowData *resourceview_data,
     resourceview_data->process_list->number_of_process++; // TODO: check
 
     /* add to process list */
-    {
-      gchar *str;
-      str = g_strdup_printf("IRQ %u", id);
-      name = g_quark_from_string(str);
-      g_free(str);
-    }
+    name = make_name_func(resourceview_data, trace_num, id);
 
     gtk_tree_store_append(resourceview_data->process_list->list_store, &data->y_iter, &parent->y_iter);
     gtk_tree_store_set(resourceview_data->process_list->list_store, &data->y_iter,
@@ -681,83 +649,23 @@ HashedResourceData *resourcelist_obtain_irq(ControlFlowData *resourceview_data,
   return data;
 }
 
-HashedResourceData *resourcelist_obtain_bdev(ControlFlowData *resourceview_data, guint trace_num, guint id)
+HashedResourceData *resourcelist_obtain_cpu(ControlFlowData *resourceview_data, guint trace_num, guint id)
 {
-  ResourceUniqueNumeric *ru = g_new(ResourceUniqueNumeric, 1);
-  HashedResourceData *data = g_new(HashedResourceData, 1);
-  
-  /* Prepare hash key */
-  ru->trace_num = trace_num;
-  ru->id = id;
-  
-  /* Search within hash table */
-  GHashTable *ht = resourceview_data->process_list->restypes[RV_RESOURCE_BDEV].hash_table;
-  data = g_hash_table_lookup(ht, ru);
-  
-  /* If not found in hash table, add it */
-  if(data == NULL) {
-    GQuark name;
-    HashedResourceData *parent;
-
-    /* Find the parent machine */
-    parent = resourcelist_obtain_machine(resourceview_data, trace_num, trace_num);
-
-    /* Prepare hashed data */
-    data = g_malloc(sizeof(HashedResourceData));
-
-    data->type = RV_RESOURCE_BDEV;
-    data->x.over = 0;
-    data->x.over_used = FALSE;
-    data->x.over_marked = FALSE;
-    data->x.middle = 0; // last 
-    data->x.middle_used = FALSE;
-    data->x.middle_marked = FALSE;
-    data->x.under = 0;
-    data->x.under_used = FALSE;
-    data->x.under_marked = FALSE;
-    data->next_good_time = ltt_time_zero;
-
-    data->height = resourceview_data->process_list->cell_height;
-    data->pixmap = 
-        gdk_pixmap_new(resourceview_data->drawing->drawing_area->window,
-                       resourceview_data->drawing->alloc_width,
-                       data->height,
-                       -1);
-
-    gdk_draw_rectangle (data->pixmap,
-        resourceview_data->drawing->drawing_area->style->black_gc,
-        TRUE,
-        0, 0,
-        resourceview_data->drawing->alloc_width,
-        data->height);
-
-    /* add to hash table */
-    g_hash_table_insert(ht, ru, data);
-    resourceview_data->process_list->number_of_process++; // TODO: check
-
-    /* add to process list */
-    {
-      gchar *str;
-      str = g_strdup_printf("Block (%u,%u)", MAJOR(id), MINOR(id));
-      name = g_quark_from_string(str);
-      g_free(str);
-    }
-
-    gtk_tree_store_append(resourceview_data->process_list->list_store, &data->y_iter, &parent->y_iter);
-    gtk_tree_store_set(resourceview_data->process_list->list_store, &data->y_iter,
-         NAME_COLUMN, g_quark_to_string(name), DATA_COLUMN, data,
-         -1);
-
-    update_index_to_pixmap(resourceview_data->process_list);
-
-    int heightall = data->height * resourceview_data->process_list->number_of_process;
+  return resourcelist_obtain_generic(resourceview_data, RV_RESOURCE_CPU, trace_num, id, make_cpu_name);
+}
 
-    gtk_widget_set_size_request(resourceview_data->drawing->drawing_area,
-                              -1,
-                              heightall);
+HashedResourceData *resourcelist_obtain_irq(ControlFlowData *resourceview_data, guint trace_num, guint id)
+{
+  return resourcelist_obtain_generic(resourceview_data, RV_RESOURCE_IRQ, trace_num, id, make_irq_name);
+}
 
-    gtk_widget_queue_draw(resourceview_data->drawing->drawing_area);
-  }
+HashedResourceData *resourcelist_obtain_soft_irq(ControlFlowData *resourceview_data, guint trace_num, guint id)
+{
+  return resourcelist_obtain_generic(resourceview_data, RV_RESOURCE_SOFT_IRQ, trace_num, id, make_soft_irq_name);
+}
 
-  return data;
+HashedResourceData *resourcelist_obtain_bdev(ControlFlowData *resourceview_data, guint trace_num, guint id)
+{
+  return resourcelist_obtain_generic(resourceview_data, RV_RESOURCE_BDEV, trace_num, id, make_bdev_name);
 }
+