mirror of
https://github.com/varun-r-mallya/sysprof.git
synced 2025-12-31 20:36:25 +00:00
libsysprof-gtk: add augmented functions list
This provides an area to have augmented functions listing like we have in the 3-part sysprof view in our current release. The weighed callgrpah view uses this to show self/total sortable columns similar to the descendants view.
This commit is contained in:
Christian Hergert
@ -34,7 +34,9 @@ struct _SysprofCallgraphView
|
||||
GListModel *traceables;
|
||||
|
||||
GtkColumnView *column_view;
|
||||
GtkWidget *scrolled_window;
|
||||
GtkColumnView *functions_column_view;
|
||||
GtkScrolledWindow *scrolled_window;
|
||||
GtkWidget *paned;
|
||||
|
||||
GCancellable *cancellable;
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ sysprof_callgraph_view_dispose (GObject *object)
|
||||
|
||||
g_clear_handle_id (&self->reload_source, g_source_remove);
|
||||
|
||||
g_clear_pointer ((GtkWidget **)&self->scrolled_window, gtk_widget_unparent);
|
||||
g_clear_pointer (&self->paned, gtk_widget_unparent);
|
||||
|
||||
g_cancellable_cancel (self->cancellable);
|
||||
g_clear_object (&self->cancellable);
|
||||
@ -153,6 +153,8 @@ sysprof_callgraph_view_class_init (SysprofCallgraphViewClass *klass)
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-callgraph-view.ui");
|
||||
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofCallgraphView, column_view);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofCallgraphView, functions_column_view);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofCallgraphView, paned);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofCallgraphView, scrolled_window);
|
||||
gtk_widget_class_bind_template_callback (widget_class, sysprof_callgraph_view_key_pressed_cb);
|
||||
|
||||
@ -187,7 +189,10 @@ sysprof_callgraph_view_reload_cb (GObject *object,
|
||||
g_autoptr(SysprofCallgraph) callgraph = NULL;
|
||||
g_autoptr(GtkTreeListRowSorter) sorter = NULL;
|
||||
g_autoptr(GtkMultiSelection) model = NULL;
|
||||
g_autoptr(GtkSingleSelection) functions_selection = NULL;
|
||||
g_autoptr(GtkSortListModel) sort_model = NULL;
|
||||
g_autoptr(GtkSortListModel) functions_sort_model = NULL;
|
||||
g_autoptr(GListModel) functions_model = NULL;
|
||||
g_autoptr(GtkTreeListModel) tree = NULL;
|
||||
g_autoptr(GtkTreeListRow) first = NULL;
|
||||
g_autoptr(GError) error = NULL;
|
||||
@ -216,6 +221,14 @@ sysprof_callgraph_view_reload_cb (GObject *object,
|
||||
model = gtk_multi_selection_new (g_object_ref (G_LIST_MODEL (sort_model)));
|
||||
gtk_column_view_set_model (self->column_view, GTK_SELECTION_MODEL (model));
|
||||
|
||||
column_sorter = gtk_column_view_get_sorter (self->functions_column_view);
|
||||
functions_model = sysprof_callgraph_list_symbols (callgraph);
|
||||
functions_sort_model = gtk_sort_list_model_new (g_object_ref (functions_model),
|
||||
g_object_ref (column_sorter));
|
||||
functions_selection = gtk_single_selection_new (g_object_ref (G_LIST_MODEL (functions_sort_model)));
|
||||
gtk_column_view_set_model (self->functions_column_view,
|
||||
GTK_SELECTION_MODEL (functions_selection));
|
||||
|
||||
if (SYSPROF_CALLGRAPH_VIEW_GET_CLASS (self)->load)
|
||||
SYSPROF_CALLGRAPH_VIEW_GET_CLASS (self)->load (self, callgraph);
|
||||
|
||||
@ -329,6 +342,8 @@ sysprof_callgraph_view_get_internal_child (GtkBuildable *buildable,
|
||||
{
|
||||
if (g_strcmp0 (name, "column_view") == 0)
|
||||
return G_OBJECT (SYSPROF_CALLGRAPH_VIEW (buildable)->column_view);
|
||||
else if (g_strcmp0 (name, "functions_column_view") == 0)
|
||||
return G_OBJECT (SYSPROF_CALLGRAPH_VIEW (buildable)->functions_column_view);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -2,19 +2,67 @@
|
||||
<interface>
|
||||
<template class="SysprofCallgraphView" parent="GtkWidget">
|
||||
<child>
|
||||
<object class="GtkScrolledWindow" id="scrolled_window">
|
||||
<child>
|
||||
<object class="GtkColumnView" id="column_view">
|
||||
<style>
|
||||
<class name="data-table"/>
|
||||
</style>
|
||||
<object class="GtkPaned" id="paned">
|
||||
<property name="position">250</property>
|
||||
<property name="start-child">
|
||||
<object class="GtkPaned">
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="start-child">
|
||||
<object class="GtkScrolledWindow" id="functions_scrolled_window">
|
||||
<property name="hscrollbar-policy">never</property>
|
||||
<child>
|
||||
<object class="GtkColumnView" id="functions_column_view">
|
||||
<child>
|
||||
<object class="GtkColumnViewColumn" id="function_column">
|
||||
<property name="title" translatable="yes">Functions</property>
|
||||
<property name="expand">true</property>
|
||||
<property name="factory">
|
||||
<object class="GtkBuilderListItemFactory">
|
||||
<property name="bytes"><![CDATA[
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GtkListItem">
|
||||
<property name="child">
|
||||
<object class="GtkInscription">
|
||||
<property name="text-overflow">ellipsize-end</property>
|
||||
<property name="xalign">.0</property>
|
||||
<binding name="text">
|
||||
<lookup name="name">
|
||||
<lookup name="symbol" type="SysprofCallgraphSymbol">
|
||||
<lookup name="item">GtkListItem</lookup>
|
||||
</lookup>
|
||||
</lookup>
|
||||
</binding>
|
||||
</object>
|
||||
</property>
|
||||
</template>
|
||||
</interface>
|
||||
]]>
|
||||
</property>
|
||||
</object>
|
||||
</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="end-child">
|
||||
<object class="GtkScrolledWindow" id="scrolled_window">
|
||||
<child>
|
||||
<object class="GtkColumnViewColumn" id="function_column">
|
||||
<property name="title" translatable="yes">Function</property>
|
||||
<property name="expand">true</property>
|
||||
<property name="factory">
|
||||
<object class="GtkBuilderListItemFactory">
|
||||
<property name="bytes"><![CDATA[
|
||||
<object class="GtkColumnView" id="column_view">
|
||||
<style>
|
||||
<class name="data-table"/>
|
||||
</style>
|
||||
<child>
|
||||
<object class="GtkColumnViewColumn" id="descendants_column">
|
||||
<property name="title" translatable="yes">Descendants</property>
|
||||
<property name="expand">true</property>
|
||||
<property name="factory">
|
||||
<object class="GtkBuilderListItemFactory">
|
||||
<property name="bytes"><![CDATA[
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GtkListItem">
|
||||
@ -81,13 +129,15 @@
|
||||
</template>
|
||||
</interface>
|
||||
]]>
|
||||
</property>
|
||||
</object>
|
||||
</property>
|
||||
</object>
|
||||
</property>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</property>
|
||||
</object>
|
||||
</child>
|
||||
</template>
|
||||
|
||||
@ -30,9 +30,13 @@ struct _SysprofWeightedCallgraphView
|
||||
|
||||
GtkColumnViewColumn *self_column;
|
||||
GtkColumnViewColumn *total_column;
|
||||
|
||||
GtkCustomSorter *self_sorter;
|
||||
GtkCustomSorter *total_sorter;
|
||||
|
||||
GtkColumnViewColumn *functions_self_column;
|
||||
GtkColumnViewColumn *functions_total_column;
|
||||
GtkCustomSorter *functions_self_sorter;
|
||||
GtkCustomSorter *functions_total_sorter;
|
||||
};
|
||||
|
||||
struct _SysprofWeightedCallgraphViewClass
|
||||
@ -97,7 +101,7 @@ get_total_fraction (GObject *item)
|
||||
AugmentWeight *sum = sysprof_callgraph_frame_get_augment (frame);
|
||||
AugmentWeight *root = sysprof_callgraph_get_augment (callgraph, NULL);
|
||||
|
||||
return (double)sum->total / (double)root->total;
|
||||
return sum->total / (double)root->total;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -124,10 +128,48 @@ get_self_fraction (GObject *item)
|
||||
return .0;
|
||||
}
|
||||
|
||||
static double
|
||||
functions_get_total_fraction (GObject *item)
|
||||
{
|
||||
g_autoptr(SysprofCallgraphSymbol) sym = NULL;
|
||||
|
||||
g_object_get (item, "item", &sym, NULL);
|
||||
|
||||
if (SYSPROF_IS_CALLGRAPH_SYMBOL (sym))
|
||||
{
|
||||
SysprofCallgraph *callgraph = sysprof_callgraph_symbol_get_callgraph (sym);
|
||||
AugmentWeight *sum = sysprof_callgraph_symbol_get_summary_augment (sym);
|
||||
AugmentWeight *root = sysprof_callgraph_get_augment (callgraph, NULL);
|
||||
|
||||
return sum->total / (double)root->total;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static double
|
||||
functions_get_self_fraction (GObject *item)
|
||||
{
|
||||
g_autoptr(SysprofCallgraphSymbol) sym = NULL;
|
||||
|
||||
g_object_get (item, "item", &sym, NULL);
|
||||
|
||||
if (SYSPROF_IS_CALLGRAPH_SYMBOL (sym))
|
||||
{
|
||||
SysprofCallgraph *callgraph = sysprof_callgraph_symbol_get_callgraph (sym);
|
||||
AugmentWeight *sum = sysprof_callgraph_symbol_get_summary_augment (sym);
|
||||
AugmentWeight *root = sysprof_callgraph_get_augment (callgraph, NULL);
|
||||
|
||||
return sum->size / (double)root->total;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
sort_by_self (gconstpointer a,
|
||||
gconstpointer b,
|
||||
gpointer user_data)
|
||||
descendants_sort_by_self (gconstpointer a,
|
||||
gconstpointer b,
|
||||
gpointer user_data)
|
||||
{
|
||||
SysprofCallgraphFrame *frame_a = (SysprofCallgraphFrame *)a;
|
||||
SysprofCallgraphFrame *frame_b = (SysprofCallgraphFrame *)b;
|
||||
@ -146,9 +188,9 @@ sort_by_self (gconstpointer a,
|
||||
}
|
||||
|
||||
static int
|
||||
sort_by_total (gconstpointer a,
|
||||
gconstpointer b,
|
||||
gpointer user_data)
|
||||
descendants_sort_by_total (gconstpointer a,
|
||||
gconstpointer b,
|
||||
gpointer user_data)
|
||||
{
|
||||
SysprofCallgraphFrame *frame_a = (SysprofCallgraphFrame *)a;
|
||||
SysprofCallgraphFrame *frame_b = (SysprofCallgraphFrame *)b;
|
||||
@ -166,6 +208,48 @@ sort_by_total (gconstpointer a,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
functions_sort_by_self (gconstpointer a,
|
||||
gconstpointer b,
|
||||
gpointer user_data)
|
||||
{
|
||||
SysprofCallgraphSymbol *sym_a = (SysprofCallgraphSymbol *)a;
|
||||
SysprofCallgraphSymbol *sym_b = (SysprofCallgraphSymbol *)b;
|
||||
AugmentWeight *aug_a = sysprof_callgraph_symbol_get_summary_augment (sym_a);
|
||||
AugmentWeight *aug_b = sysprof_callgraph_symbol_get_summary_augment (sym_b);
|
||||
AugmentWeight *root = user_data;
|
||||
double self_a = aug_a->size / (double)root->total;
|
||||
double self_b = aug_b->size / (double)root->total;
|
||||
|
||||
if (self_a < self_b)
|
||||
return -1;
|
||||
else if (self_a > self_b)
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
functions_sort_by_total (gconstpointer a,
|
||||
gconstpointer b,
|
||||
gpointer user_data)
|
||||
{
|
||||
SysprofCallgraphSymbol *sym_a = (SysprofCallgraphSymbol *)a;
|
||||
SysprofCallgraphSymbol *sym_b = (SysprofCallgraphSymbol *)b;
|
||||
AugmentWeight *aug_a = sysprof_callgraph_symbol_get_summary_augment (sym_a);
|
||||
AugmentWeight *aug_b = sysprof_callgraph_symbol_get_summary_augment (sym_b);
|
||||
AugmentWeight *root = user_data;
|
||||
double total_a = aug_a->total / (double)root->total;
|
||||
double total_b = aug_b->total / (double)root->total;
|
||||
|
||||
if (total_a < total_b)
|
||||
return -1;
|
||||
else if (total_a > total_b)
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
sysprof_weighted_callgraph_view_load (SysprofCallgraphView *view,
|
||||
SysprofCallgraph *callgraph)
|
||||
@ -178,12 +262,18 @@ sysprof_weighted_callgraph_view_load (SysprofCallgraphView *view,
|
||||
|
||||
root = sysprof_callgraph_get_augment (callgraph, NULL);
|
||||
|
||||
gtk_custom_sorter_set_sort_func (self->self_sorter, sort_by_self, root, NULL);
|
||||
gtk_custom_sorter_set_sort_func (self->total_sorter, sort_by_total, root, NULL);
|
||||
gtk_custom_sorter_set_sort_func (self->self_sorter, descendants_sort_by_self, root, NULL);
|
||||
gtk_custom_sorter_set_sort_func (self->total_sorter, descendants_sort_by_total, root, NULL);
|
||||
|
||||
gtk_custom_sorter_set_sort_func (self->functions_self_sorter, functions_sort_by_self, root, NULL);
|
||||
gtk_custom_sorter_set_sort_func (self->functions_total_sorter, functions_sort_by_total, root, NULL);
|
||||
|
||||
gtk_column_view_sort_by_column (SYSPROF_CALLGRAPH_VIEW (self)->column_view,
|
||||
self->total_column,
|
||||
GTK_SORT_DESCENDING);
|
||||
gtk_column_view_sort_by_column (SYSPROF_CALLGRAPH_VIEW (self)->functions_column_view,
|
||||
self->functions_total_column,
|
||||
GTK_SORT_DESCENDING);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -197,12 +287,21 @@ sysprof_weighted_callgraph_view_class_init (SysprofWeightedCallgraphViewClass *k
|
||||
callgraph_view_class->load = sysprof_weighted_callgraph_view_load;
|
||||
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-weighted-callgraph-view.ui");
|
||||
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, self_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, total_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, self_sorter);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, total_sorter);
|
||||
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, functions_self_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, functions_total_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, functions_self_sorter);
|
||||
gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, functions_total_sorter);
|
||||
|
||||
gtk_widget_class_bind_template_callback (widget_class, get_self_fraction);
|
||||
gtk_widget_class_bind_template_callback (widget_class, get_total_fraction);
|
||||
gtk_widget_class_bind_template_callback (widget_class, functions_get_self_fraction);
|
||||
gtk_widget_class_bind_template_callback (widget_class, functions_get_total_fraction);
|
||||
|
||||
g_type_ensure (SYSPROF_TYPE_PROGRESS_CELL);
|
||||
}
|
||||
|
||||
@ -65,5 +65,72 @@
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child internal-child="functions_column_view">
|
||||
<object class="GtkColumnView">
|
||||
<style>
|
||||
<class name="data-table"/>
|
||||
</style>
|
||||
<child>
|
||||
<object class="GtkColumnViewColumn" id="functions_self_column">
|
||||
<property name="title" translatable="yes">Self</property>
|
||||
<property name="factory">
|
||||
<object class="GtkBuilderListItemFactory">
|
||||
<property name="bytes"><![CDATA[
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GtkListItem">
|
||||
<property name="child">
|
||||
<object class="SysprofProgressCell" id="progress">
|
||||
<binding name="fraction">
|
||||
<closure type="gdouble" function="functions_get_self_fraction">
|
||||
<lookup name="item">GtkListItem</lookup>
|
||||
</closure>
|
||||
</binding>
|
||||
</object>
|
||||
</property>
|
||||
</template>
|
||||
</interface>
|
||||
]]>
|
||||
</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="sorter">
|
||||
<object class="GtkCustomSorter" id="functions_self_sorter">
|
||||
</object>
|
||||
</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkColumnViewColumn" id="functions_total_column">
|
||||
<property name="title" translatable="yes">Total</property>
|
||||
<property name="factory">
|
||||
<object class="GtkBuilderListItemFactory">
|
||||
<property name="bytes"><![CDATA[
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<interface>
|
||||
<template class="GtkListItem">
|
||||
<property name="child">
|
||||
<object class="SysprofProgressCell" id="progress">
|
||||
<binding name="fraction">
|
||||
<closure type="gdouble" function="functions_get_total_fraction">
|
||||
<lookup name="item">GtkListItem</lookup>
|
||||
</closure>
|
||||
</binding>
|
||||
</object>
|
||||
</property>
|
||||
</template>
|
||||
</interface>
|
||||
]]>
|
||||
</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="sorter">
|
||||
<object class="GtkCustomSorter" id="functions_total_sorter">
|
||||
</object>
|
||||
</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</template>
|
||||
</interface>
|
||||
|
||||
Reference in New Issue
Block a user