linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	David Ahern <dsahern@gmail.com>,
	Stephane Eranian <eranian@google.com>,
	Andi Kleen <andi@firstfloor.org>, Wang Nan <wangnan0@huawei.com>,
	Pekka Enberg <penberg@kernel.org>
Subject: [PATCH 14/17] perf ui/gtk: Implement hierarchy output mode
Date: Sun, 17 Jan 2016 01:03:14 +0900	[thread overview]
Message-ID: <1452960197-5323-15-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1452960197-5323-1-git-send-email-namhyung@kernel.org>

The hierarchy output mode is to group entries for each level so that
user can see higher level picture more easily.

Cc: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/ui/gtk/hists.c | 161 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 160 insertions(+), 1 deletion(-)

diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index 0f8dcfdfb10f..f33df340fc45 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -396,6 +396,162 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
 	gtk_container_add(GTK_CONTAINER(window), view);
 }
 
+static void perf_gtk__add_hierarchy_entries(struct hists *hists,
+					    struct rb_root *root,
+					    GtkTreeStore *store,
+					    GtkTreeIter *parent,
+					    struct perf_hpp *hpp,
+					    float min_pcnt)
+{
+	int col_idx = 0;
+	struct rb_node *node;
+	struct hist_entry *he;
+	struct perf_hpp_fmt *fmt;
+	u64 total = hists__total_period(hists);
+
+	for (node = rb_first(root); node; node = rb_next(node)) {
+		GtkTreeIter iter;
+		float percent;
+
+		he = rb_entry(node, struct hist_entry, rb_node);
+		if (he->filtered)
+			continue;
+
+		percent = hist_entry__get_percent_limit(he);
+		if (percent < min_pcnt)
+			continue;
+
+		gtk_tree_store_append(store, &iter, parent);
+
+		col_idx = 0;
+		perf_hpp__for_each_format(fmt) {
+			if (perf_hpp__is_sort_entry(fmt) ||
+			    perf_hpp__is_dynamic_entry(fmt))
+				break;
+
+			if (fmt->color)
+				fmt->color(fmt, hpp, he);
+			else
+				fmt->entry(fmt, hpp, he);
+
+			gtk_tree_store_set(store, &iter, col_idx++, hpp->buf, -1);
+		}
+
+		fmt = he->fmt;
+		if (fmt->color)
+			fmt->color(fmt, hpp, he);
+		else
+			fmt->entry(fmt, hpp, he);
+
+		gtk_tree_store_set(store, &iter, col_idx, rtrim(hpp->buf), -1);
+
+		if (!he->leaf) {
+			perf_gtk__add_hierarchy_entries(hists, &he->hroot_out,
+							store, &iter, hpp,
+							min_pcnt);
+		}
+
+		if (symbol_conf.use_callchain && he->leaf) {
+			if (callchain_param.mode == CHAIN_GRAPH_REL)
+				total = symbol_conf.cumulate_callchain ?
+					he->stat_acc->period : he->stat.period;
+
+			perf_gtk__add_callchain(&he->sorted_chain, store, &iter,
+						col_idx, total);
+		}
+	}
+
+}
+
+static void perf_gtk__show_hierarchy(GtkWidget *window, struct hists *hists,
+				     float min_pcnt)
+{
+	struct perf_hpp_fmt *fmt;
+	GType col_types[MAX_COLUMNS];
+	GtkCellRenderer *renderer;
+	GtkTreeStore *store;
+	GtkWidget *view;
+	int col_idx;
+	int nr_cols = 0;
+	char s[512];
+	char buf[512];
+	bool first = true;
+	struct perf_hpp hpp = {
+		.buf		= s,
+		.size		= sizeof(s),
+	};
+
+	perf_hpp__for_each_format(fmt) {
+		if (perf_hpp__is_sort_entry(fmt) ||
+		    perf_hpp__is_dynamic_entry(fmt))
+			break;
+
+		col_types[nr_cols++] = G_TYPE_STRING;
+	}
+	col_types[nr_cols++] = G_TYPE_STRING;
+
+	store = gtk_tree_store_newv(nr_cols, col_types);
+	view = gtk_tree_view_new();
+	renderer = gtk_cell_renderer_text_new();
+
+	col_idx = 0;
+	perf_hpp__for_each_format(fmt) {
+		if (perf_hpp__is_sort_entry(fmt) ||
+		    perf_hpp__is_dynamic_entry(fmt))
+			break;
+
+		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
+							    -1, fmt->name,
+							    renderer, "markup",
+							    col_idx++, NULL);
+	}
+
+	/* construct merged column header since sort keys share single column */
+	buf[0] = '\0';
+	perf_hpp__for_each_format(fmt) {
+		if (!perf_hpp__is_sort_entry(fmt) &&
+		    !perf_hpp__is_dynamic_entry(fmt))
+			continue;
+
+		if (first)
+			first = false;
+		else
+			strcat(buf, " / ");
+
+		fmt->header(fmt, &hpp, hists_to_evsel(hists));
+		strcat(buf, rtrim(hpp.buf));
+	}
+
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
+						    -1, buf,
+						    renderer, "markup",
+						    col_idx++, NULL);
+
+	for (col_idx = 0; col_idx < nr_cols; col_idx++) {
+		GtkTreeViewColumn *column;
+
+		column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), col_idx);
+		gtk_tree_view_column_set_resizable(column, TRUE);
+
+		if (col_idx == 0) {
+			gtk_tree_view_set_expander_column(GTK_TREE_VIEW(view),
+							  column);
+		}
+	}
+
+	gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));
+	g_object_unref(GTK_TREE_MODEL(store));
+
+	perf_gtk__add_hierarchy_entries(hists, &hists->entries, store,
+					NULL, &hpp, min_pcnt);
+
+	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
+
+	g_signal_connect(view, "row-activated",
+			 G_CALLBACK(on_row_activated), NULL);
+	gtk_container_add(GTK_CONTAINER(window), view);
+}
+
 int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,
 				  const char *help,
 				  struct hist_browser_timer *hbt __maybe_unused,
@@ -463,7 +619,10 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,
 							GTK_POLICY_AUTOMATIC,
 							GTK_POLICY_AUTOMATIC);
 
-		perf_gtk__show_hists(scrolled_window, hists, min_pcnt);
+		if (symbol_conf.report_hierarchy)
+			perf_gtk__show_hierarchy(scrolled_window, hists, min_pcnt);
+		else
+			perf_gtk__show_hists(scrolled_window, hists, min_pcnt);
 
 		tab_label = gtk_label_new(evname);
 
-- 
2.6.4

  parent reply	other threads:[~2016-01-16 16:05 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-16 16:03 [RFC/PATCHSET 00/17] perf tools: Add support for hierachy view (v2) Namhyung Kim
2016-01-16 16:03 ` [PATCH 01/17] perf hists: Basic support of hierarchical report view Namhyung Kim
2016-01-17 16:15   ` Jiri Olsa
2016-01-19 10:51     ` Namhyung Kim
2016-01-19 16:50       ` Arnaldo Carvalho de Melo
2016-01-20 17:00         ` Jiri Olsa
2016-01-20 17:09           ` Arnaldo Carvalho de Melo
2016-01-21  4:08           ` Namhyung Kim
2016-01-21 10:43   ` Jiri Olsa
2016-01-21 12:55     ` Namhyung Kim
2016-01-21 13:35       ` Jiri Olsa
2016-01-21 14:02         ` Arnaldo Carvalho de Melo
2016-01-22 10:44           ` Namhyung Kim
2016-01-22 10:43         ` Namhyung Kim
2016-01-22 11:37           ` Jiri Olsa
2016-01-21 11:35   ` Jiri Olsa
2016-01-21 13:01     ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 02/17] perf hists: Resort hist entries with hierarchy Namhyung Kim
2016-01-21 11:41   ` Jiri Olsa
2016-01-21 13:03     ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 03/17] perf hists: Add helper functions for hierarchy mode Namhyung Kim
2016-01-20 22:19   ` Arnaldo Carvalho de Melo
2016-01-21  3:59     ` Namhyung Kim
2016-01-21  4:19       ` [PATCH v2 " Namhyung Kim
2016-01-21 13:05         ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 04/17] perf hists: Cleanup filtering functions Namhyung Kim
2016-01-19 20:39   ` Arnaldo Carvalho de Melo
2016-01-20  1:15     ` [PATCH v2 04.1/17] perf hists: Remove parent filter check in DSO filter function Namhyung Kim
2016-01-20  1:15       ` [PATCH v2 04.2/17] perf hists: Cleanup filtering functions Namhyung Kim
2016-01-21 12:02         ` Jiri Olsa
2016-02-03 10:08         ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-01-21 12:02       ` [PATCH v2 04.1/17] perf hists: Remove parent filter check in DSO filter function Jiri Olsa
2016-02-03 10:07       ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-01-16 16:03 ` [PATCH 05/17] perf hists: Support filtering in hierarchy mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 06/17] perf ui/stdio: Implement hierarchy output mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 07/17] perf ui/stdio: Align column header for hierarchy output Namhyung Kim
2016-01-20 22:40   ` Arnaldo Carvalho de Melo
2016-01-21  4:00     ` Namhyung Kim
2016-01-16 16:03 ` [PATCH 08/17] perf hists browser: Fix context menu item Namhyung Kim
2016-01-21  0:52   ` Arnaldo Carvalho de Melo
2016-01-21  4:07     ` Namhyung Kim
2016-01-21 23:51       ` Arnaldo Carvalho de Melo
2016-01-22 11:08         ` Namhyung Kim
2016-01-22 14:37   ` Dynamicly add/remove sort keys was: " Arnaldo Carvalho de Melo
2016-02-03 10:10   ` [tip:perf/core] perf sort: Provide a way to find out if per-thread bucketing is in place tip-bot for Namhyung Kim
2016-02-03 10:11   ` [tip:perf/core] perf hists browser: Only 'Zoom into thread' only when sort order has 'pid' tip-bot for Namhyung Kim
2016-02-03 10:11   ` [tip:perf/core] perf hists browser: Only offer symbol scripting when a symbol is under the cursor tip-bot for Namhyung Kim
2016-02-03 10:11   ` [tip:perf/core] perf hists browser: Offer 'Zoom into DSO'/' Map details' only when sort order has 'dso' tip-bot for Namhyung Kim
2016-02-03 10:12   ` [tip:perf/core] perf hists browser: Be a bit more strict about presenting CPU socket zoom tip-bot for Namhyung Kim
2016-02-03 10:12   ` [tip:perf/core] perf hists browser: Offer non-symbol specific menu options for --sort without 'sym' tip-bot for Namhyung Kim
2016-01-16 16:03 ` [PATCH 09/17] perf hists browser: Count number of hierarchy entries Namhyung Kim
2016-01-16 16:03 ` [PATCH 10/17] perf hists browser: Support collapsing/expanding whole entries in hierarchy Namhyung Kim
2016-01-16 16:03 ` [PATCH 11/17] perf hists browser: Factor out hist_browser__show_callchain() Namhyung Kim
2016-01-16 16:03 ` [PATCH 12/17] perf hists browser: Implement hierarchy output Namhyung Kim
2016-01-16 16:03 ` [PATCH 13/17] perf hists browser: Align column header in hierarchy mode Namhyung Kim
2016-01-16 16:03 ` Namhyung Kim [this message]
2016-01-16 16:03 ` [PATCH 15/17] perf report: Add --hierarchy option Namhyung Kim
2016-01-16 16:03 ` [PATCH 16/17] perf hists: Support decaying in hierarchy mode Namhyung Kim
2016-01-16 16:03 ` [PATCH 17/17] perf top: Add --hierarchy option Namhyung Kim
2016-01-17 10:25 ` [RFC/PATCHSET 00/17] perf tools: Add support for hierachy view (v2) Pekka Enberg
2016-01-19 10:42   ` Namhyung Kim
2016-01-17 19:31 ` Andi Kleen
2016-01-19 10:45   ` Namhyung Kim
2016-01-19 21:03     ` Arnaldo Carvalho de Melo
2016-01-19 21:07       ` Arnaldo Carvalho de Melo
2016-01-19 22:12     ` Andi Kleen
2016-01-19 22:24       ` Arnaldo Carvalho de Melo
2016-01-20  0:56         ` Namhyung Kim
2016-01-20  1:11           ` Andi Kleen
2016-01-20  1:36             ` Namhyung Kim
2016-01-20  1:43               ` Andi Kleen
2016-01-20 13:34           ` Arnaldo Carvalho de Melo
2016-01-19 20:00 ` Arnaldo Carvalho de Melo
2016-01-19 20:52 ` Arnaldo Carvalho de Melo
2016-01-20  0:19   ` Namhyung Kim
2016-01-19 20:59 ` Arnaldo Carvalho de Melo
2016-01-20  0:34   ` Namhyung Kim
2016-01-20  5:28     ` Andi Kleen
2016-01-20  7:49     ` Taeung Song
2016-01-20 15:08       ` Namhyung Kim
2016-01-20 16:34         ` Taeung Song
2016-01-21  4:17           ` Namhyung Kim
2016-01-21  4:58             ` Taeung Song
2016-01-20 13:32     ` Arnaldo Carvalho de Melo
2016-01-20 15:01       ` Namhyung Kim
2016-01-20 15:25         ` Arnaldo Carvalho de Melo
2016-01-20 15:29           ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452960197-5323-15-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@kernel.org \
    --cc=andi@firstfloor.org \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=penberg@kernel.org \
    --cc=peterz@infradead.org \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).