[gtk+] inspector: Some improvements for statistics

[Matthias Clasen <matthiasc src gnome org>]

commit 5624da20e3016d19ccf54123add27a5c027b9d95
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Oct 11 17:58:31 2014 -0400

    inspector: Some improvements for statistics
    
    Show the last two snapshots, plus a delta.

 gtk/inspector/statistics.c    |  203 +++++++++++++++++++++++++++++++---------
 gtk/inspector/statistics.ui   |   42 +++++++--
 gtk/inspector/statistics.ui.h |    6 +-
 3 files changed, 195 insertions(+), 56 deletions(-)
---
diff --git a/gtk/inspector/statistics.c b/gtk/inspector/statistics.c
index 0427c5d..f64c839 100644
--- a/gtk/inspector/statistics.c
+++ b/gtk/inspector/statistics.c
@@ -30,42 +30,39 @@ struct _GtkInspectorStatisticsPrivate
   GtkWidget *stack;
   GtkTreeModel *model;
   GtkTreeView  *view;
-  GtkTreeViewColumn *column_self;
-  GtkCellRenderer *renderer_self;
-  GtkTreeViewColumn *column_cumulative;
-  GtkCellRenderer *renderer_cumulative;
   GtkWidget *button;
+  GHashTable *data;
+  GtkTreeViewColumn *column_self1;
+  GtkCellRenderer *renderer_self1;
+  GtkTreeViewColumn *column_cumulative1;
+  GtkCellRenderer *renderer_cumulative1;
+  GtkTreeViewColumn *column_self2;
+  GtkCellRenderer *renderer_self2;
+  GtkTreeViewColumn *column_cumulative2;
+  GtkCellRenderer *renderer_cumulative2;
+  gint snapshot_count;
+  GHashTable *counts;
 };
 
+typedef struct {
+  GType type;
+  gint self1;
+  gint cumulative1;
+  gint self2;
+  gint cumulative2;
+} TypeData;
+
 enum
 {
   COLUMN_TYPE,
-  COLUMN_SELF,
-  COLUMN_CUMULATIVE
+  COLUMN_SELF1,
+  COLUMN_CUMULATIVE1,
+  COLUMN_SELF2,
+  COLUMN_CUMULATIVE2
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorStatistics, gtk_inspector_statistics, GTK_TYPE_BOX)
 
-static void
-cell_data_func (GtkCellLayout   *layout,
-                GtkCellRenderer *cell,
-                GtkTreeModel    *model,
-                GtkTreeIter     *iter,
-                gpointer         data)
-{
-  gint column;
-  gint count;
-  gchar *text;
-
-  column = GPOINTER_TO_INT (data);
-
-  gtk_tree_model_get (model, iter, column, &count, -1);
-
-  text = g_strdup_printf ("%d", count);
-  g_object_set (cell, "text", text, NULL);
-  g_free (text);
-}
-
 static gint
 add_type_count (GtkInspectorStatistics *sl, GType type)
 {
@@ -73,8 +70,8 @@ add_type_count (GtkInspectorStatistics *sl, GType type)
   gint self;
   GType *children;
   guint n_children;
-  GtkTreeIter iter;
   gint i;
+  TypeData *data;
 
   cumulative = 0;
 
@@ -82,14 +79,19 @@ add_type_count (GtkInspectorStatistics *sl, GType type)
   for (i = 0; i < n_children; i++)
     cumulative += add_type_count (sl, children[i]);
 
+  data = g_hash_table_lookup (sl->priv->counts, GSIZE_TO_POINTER (type));
+  if (!data)
+    {
+      data = g_new0 (TypeData, 1);
+      data->type = type;
+      g_hash_table_insert (sl->priv->counts, GSIZE_TO_POINTER (type), data);
+    }
+
   self = g_type_get_instance_count (type);
   cumulative += self;
-  gtk_list_store_append (GTK_LIST_STORE (sl->priv->model), &iter);
-  gtk_list_store_set (GTK_LIST_STORE (sl->priv->model), &iter,
-                      COLUMN_TYPE, g_type_name (type),
-                      COLUMN_SELF, self,
-                      COLUMN_CUMULATIVE, cumulative,
-                      -1);
+
+  data->self2 = self;
+  data->cumulative2 = cumulative;
 
   return cumulative;
 }
@@ -99,8 +101,27 @@ refresh_clicked (GtkWidget *button, GtkInspectorStatistics *sl)
 {
   GType type;
   gpointer class;
+  GHashTableIter iter;
+  TypeData *data;
+  GtkTreeIter treeiter;
 
-  gtk_list_store_clear (GTK_LIST_STORE (sl->priv->model));
+  g_hash_table_iter_init (&iter, sl->priv->counts);
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&data))
+    {
+      data->self1 = data->self2;
+      data->cumulative1 = data->cumulative2;
+    }
+
+  if (sl->priv->snapshot_count == 0)
+    {
+      gtk_tree_view_column_set_visible (sl->priv->column_self2, TRUE);
+      gtk_tree_view_column_set_visible (sl->priv->column_cumulative2, TRUE);
+    }
+  else if (sl->priv->snapshot_count == 1)
+    {
+      gtk_tree_view_column_set_visible (sl->priv->column_self1, TRUE);
+      gtk_tree_view_column_set_visible (sl->priv->column_cumulative1, TRUE);
+    }
 
   for (type = G_TYPE_INTERFACE; type <= G_TYPE_FUNDAMENTAL_MAX; type += G_TYPE_FUNDAMENTAL_SHIFT)
     {
@@ -113,6 +134,23 @@ refresh_clicked (GtkWidget *button, GtkInspectorStatistics *sl)
 
       add_type_count (sl, type);
     }
+
+  gtk_list_store_clear (GTK_LIST_STORE (sl->priv->model));
+
+  g_hash_table_iter_init (&iter, sl->priv->counts);
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&data))
+    {
+      gtk_list_store_append (GTK_LIST_STORE (sl->priv->model), &treeiter);
+      gtk_list_store_set (GTK_LIST_STORE (sl->priv->model), &treeiter,
+                          COLUMN_TYPE, g_type_name (data->type),
+                          COLUMN_SELF1, data->self1,
+                          COLUMN_CUMULATIVE1, data->cumulative1,
+                          COLUMN_SELF2, data->self2,
+                          COLUMN_CUMULATIVE2, data->cumulative2,
+                          -1);
+    }
+
+  sl->priv->snapshot_count++;
 }
 
 static gboolean
@@ -137,18 +175,74 @@ has_instance_counts (void)
 }
 
 static void
+cell_data_data (GtkCellLayout   *layout,
+                GtkCellRenderer *cell,
+                GtkTreeModel    *model,
+                GtkTreeIter     *iter,
+                gpointer         data)
+{
+  gint column;
+  gint count;
+  gchar *text;
+
+  column = GPOINTER_TO_INT (data);
+
+  gtk_tree_model_get (model, iter, column, &count, -1);
+
+  text = g_strdup_printf ("%d", count);
+  g_object_set (cell, "text", text, NULL);
+  g_free (text);
+}
+
+static void
+cell_data_delta (GtkCellLayout   *layout,
+                 GtkCellRenderer *cell,
+                 GtkTreeModel    *model,
+                 GtkTreeIter     *iter,
+                 gpointer         data)
+{
+  gint column;
+  gint count1;
+  gint count2;
+  gchar *text;
+
+  column = GPOINTER_TO_INT (data);
+
+  gtk_tree_model_get (model, iter, column - 2, &count1, column, &count2, -1);
+
+  if (count2 > count1)
+    text = g_strdup_printf ("%d (↗ %d)", count2, count2 - count1);
+  else if (count2 < count1)
+    text = g_strdup_printf ("%d (↘ %d)", count2, count1 - count2);
+  else
+    text = g_strdup_printf ("%d", count2);
+  g_object_set (cell, "text", text, NULL);
+  g_free (text);
+}
+
+static void
 gtk_inspector_statistics_init (GtkInspectorStatistics *sl)
 {
   sl->priv = gtk_inspector_statistics_get_instance_private (sl);
   gtk_widget_init_template (GTK_WIDGET (sl));
-  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (sl->priv->column_self),
-                                      sl->priv->renderer_self,
-                                      cell_data_func,
-                                      GINT_TO_POINTER (COLUMN_SELF), NULL);
-  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (sl->priv->column_cumulative),
-                                      sl->priv->renderer_cumulative,
-                                      cell_data_func,
-                                      GINT_TO_POINTER (COLUMN_CUMULATIVE), NULL);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (sl->priv->column_self1),
+                                      sl->priv->renderer_self1,
+                                      cell_data_data,
+                                      GINT_TO_POINTER (COLUMN_SELF1), NULL);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (sl->priv->column_cumulative1),
+                                      sl->priv->renderer_cumulative1,
+                                      cell_data_data,
+                                      GINT_TO_POINTER (COLUMN_CUMULATIVE1), NULL);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (sl->priv->column_self2),
+                                      sl->priv->renderer_self2,
+                                      cell_data_delta,
+                                      GINT_TO_POINTER (COLUMN_SELF2), NULL);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (sl->priv->column_cumulative2),
+                                      sl->priv->renderer_cumulative2,
+                                      cell_data_delta,
+                                      GINT_TO_POINTER (COLUMN_CUMULATIVE2), NULL);
+  sl->priv->counts = g_hash_table_new_full (NULL, NULL, NULL, g_free);
+
   if (has_instance_counts ())
     add_type_count (sl, G_TYPE_OBJECT);
   else
@@ -156,18 +250,35 @@ gtk_inspector_statistics_init (GtkInspectorStatistics *sl)
 }
 
 static void
+finalize (GObject *object)
+{
+  GtkInspectorStatistics *sl = GTK_INSPECTOR_STATISTICS (object);
+
+  g_hash_table_unref (sl->priv->counts);
+
+  G_OBJECT_CLASS (gtk_inspector_statistics_parent_class)->finalize (object);
+}
+
+static void
 gtk_inspector_statistics_class_init (GtkInspectorStatisticsClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  object_class->finalize = finalize;
+
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/statistics.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, view);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, stack);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, model);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, column_self);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, renderer_self);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, column_cumulative);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, renderer_cumulative);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, column_self1);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, renderer_self1);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, column_cumulative1);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, renderer_cumulative1);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, column_self2);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, renderer_self2);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, column_cumulative2);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, renderer_cumulative2);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, button);
   gtk_widget_class_bind_template_callback (widget_class, refresh_clicked);
 }
diff --git a/gtk/inspector/statistics.ui b/gtk/inspector/statistics.ui
index 0c79d05..af3a503 100644
--- a/gtk/inspector/statistics.ui
+++ b/gtk/inspector/statistics.ui
@@ -5,6 +5,8 @@
       <column type="gchararray"/>
       <column type="gint"/>
       <column type="gint"/>
+      <column type="gint"/>
+      <column type="gint"/>
     </columns>
   </object>
   <template class="GtkInspectorStatistics" parent="GtkBox">
@@ -58,24 +60,48 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="column_self">
-                        <property name="visible">True</property>
+                      <object class="GtkTreeViewColumn" id="column_self1">
+                        <property name="visible">False</property>
                         <property name="sort-column-id">1</property>
-                        <property name="title" translatable="yes">Self</property>
+                        <property name="title" translatable="yes">Self 1</property>
                         <child>
-                          <object class="GtkCellRendererText" id="renderer_self">
+                          <object class="GtkCellRendererText" id="renderer_self1">
                             <property name="scale">0.8</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="column_cumulative">
-                        <property name="visible">True</property>
+                      <object class="GtkTreeViewColumn" id="column_cumulative1">
+                        <property name="visible">False</property>
                         <property name="sort-column-id">2</property>
-                        <property name="title" translatable="yes">Cumulative</property>
+                        <property name="title" translatable="yes">Cumulative 1</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer_cumulative1">
+                            <property name="scale">0.8</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="column_self2">
+                        <property name="visible">False</property>
+                        <property name="sort-column-id">3</property>
+                        <property name="title" translatable="yes">Self 2</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer_self2">
+                            <property name="scale">0.8</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="column_cumulative2">
+                        <property name="visible">False</property>
+                        <property name="sort-column-id">4</property>
+                        <property name="title" translatable="yes">Cumulative 2</property>
                         <child>
-                          <object class="GtkCellRendererText" id="renderer_cumulative">
+                          <object class="GtkCellRendererText" id="renderer_cumulative2">
                             <property name="scale">0.8</property>
                           </object>
                         </child>
diff --git a/gtk/inspector/statistics.ui.h b/gtk/inspector/statistics.ui.h
index ad38e80..bbb27b3 100644
--- a/gtk/inspector/statistics.ui.h
+++ b/gtk/inspector/statistics.ui.h
@@ -1,5 +1,7 @@
 N_("Refresh");
 N_("Type");
-N_("Self");
-N_("Cumulative");
+N_("Self 1");
+N_("Cumulative 1");
+N_("Self 2");
+N_("Cumulative 2");
 N_("Enable statistics with GOBJECT_DEBUG=instance-count");