All of lore.kernel.org
 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>, Andi Kleen <andi@firstfloor.org>,
	Stephane Eranian <eranian@google.com>,
	Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 20/23] perf ui/gtk: Implement hierarchy output mode
Date: Fri,  5 Feb 2016 22:01:52 +0900	[thread overview]
Message-ID: <1454677315-7515-21-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1454677315-7515-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.

Acked-by: 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 32cc38a5b57f..803676545fc0 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;
+		hists__for_each_format(hists, 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),
+	};
+
+	hists__for_each_format(hists, 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;
+	hists__for_each_format(hists, 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';
+	hists__for_each_format(hists ,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.7.0

  parent reply	other threads:[~2016-02-05 13:04 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-05 13:01 [PATCHSET 00/23] perf tools: Add support for hierachy view (v5) Namhyung Kim
2016-02-05 13:01 ` [PATCH 01/23] perf hists browser: Fix percentage update on key press Namhyung Kim
2016-02-05 13:01 ` [PATCH 02/23] perf callchain: Check return value of add_child() Namhyung Kim
2016-02-05 13:01 ` [PATCH 03/23] perf callchain: Check return value of fill_node() Namhyung Kim
2016-02-05 13:01 ` [PATCH 04/23] perf callchain: Add enum match_result for match_chain() Namhyung Kim
2016-02-05 13:01 ` [PATCH 05/23] perf callchain: Check return value of split_add_child() Namhyung Kim
2016-02-05 13:01 ` [PATCH 06/23] perf callchain: Check return value of append_chain_children() Namhyung Kim
2016-02-05 13:01 ` [PATCH 07/23] perf hists: Return error from hists__collapse_resort() Namhyung Kim
2016-02-05 13:01 ` [PATCH 08/23] perf report: Check error during report__collapse_hists() Namhyung Kim
2016-02-05 13:01 ` [PATCH 09/23] perf hists: Basic support of hierarchical report view Namhyung Kim
2016-02-05 13:01 ` [PATCH 10/23] perf hists: Resort hist entries with hierarchy Namhyung Kim
2016-02-05 13:01 ` [PATCH 11/23] perf hists: Add helper functions for hierarchy mode Namhyung Kim
2016-02-05 13:01 ` [PATCH 12/23] perf hists: Introduce hist_entry__filter() Namhyung Kim
2016-02-05 13:01 ` [PATCH 13/23] perf hists: Support filtering in hierarchy mode Namhyung Kim
2016-02-10 11:51   ` Jiri Olsa
2016-02-10 14:00     ` Namhyung Kim
2016-02-10 12:11   ` Jiri Olsa
2016-02-10 14:16     ` Namhyung Kim
2016-02-05 13:01 ` [PATCH 14/23] perf ui/stdio: Implement hierarchy output mode Namhyung Kim
2016-02-09 22:01   ` Jiri Olsa
2016-02-10 14:21     ` Namhyung Kim
2016-02-10 12:13   ` Jiri Olsa
2016-02-10 14:25     ` Namhyung Kim
2016-02-10 12:23   ` Jiri Olsa
2016-02-10 12:29     ` Jiri Olsa
2016-02-10 14:27       ` Namhyung Kim
2016-02-05 13:01 ` [PATCH 15/23] perf ui/stdio: Align column header for hierarchy output Namhyung Kim
2016-02-10 12:40   ` Jiri Olsa
2016-02-10 14:32     ` Namhyung Kim
2016-02-05 13:01 ` [PATCH 16/23] perf hists browser: Count number of hierarchy entries Namhyung Kim
2016-02-10 12:52   ` Jiri Olsa
2016-02-10 14:42     ` Namhyung Kim
2016-02-05 13:01 ` [PATCH 17/23] perf hists browser: Support collapsing/expanding whole entries in hierarchy Namhyung Kim
2016-02-05 13:01 ` [PATCH 18/23] perf hists browser: Implement hierarchy output Namhyung Kim
2016-02-05 13:01 ` [PATCH 19/23] perf hists browser: Align column header in hierarchy mode Namhyung Kim
2016-02-05 13:01 ` Namhyung Kim [this message]
2016-02-05 13:01 ` [PATCH 21/23] perf report: Add --hierarchy option Namhyung Kim
2016-02-05 13:01 ` [PATCH 22/23] perf hists: Support decaying in hierarchy mode Namhyung Kim
2016-02-05 13:01 ` [PATCH 23/23] perf top: Add --hierarchy option Namhyung Kim
2016-02-09 22:37   ` Jiri Olsa
2016-02-10 13:19     ` Jiri Olsa
2016-02-10 14:46       ` Namhyung Kim

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=1454677315-7515-21-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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.