From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
penberg@kernel.org, namhyung.kim@lge.com, namhyung@kernel.org,
jolsa@redhat.com, dsahern@gmail.com, tglx@linutronix.de
Subject: [tip:perf/core] perf gtk/hists: Add support for callchains
Date: Fri, 19 Jul 2013 00:48:28 -0700 [thread overview]
Message-ID: <tip-2bbc5874251830fee170a0fc97fa5788717d2fd9@git.kernel.org> (raw)
In-Reply-To: <1370337737-30812-3-git-send-email-namhyung@kernel.org>
Commit-ID: 2bbc5874251830fee170a0fc97fa5788717d2fd9
Gitweb: http://git.kernel.org/tip/2bbc5874251830fee170a0fc97fa5788717d2fd9
Author: Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Tue, 4 Jun 2013 18:22:13 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 12 Jul 2013 13:52:38 -0300
perf gtk/hists: Add support for callchains
Display callchain information in the symbol column. It's only enabled
when recorded with -g and has symbol sort key.
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1370337737-30812-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/gtk/hists.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index cb6a9b4..226c7e1 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -124,6 +124,55 @@ void perf_gtk__init_hpp(void)
perf_gtk__hpp_color_overhead_guest_us;
}
+static void callchain_list__sym_name(struct callchain_list *cl,
+ char *bf, size_t bfsize)
+{
+ if (cl->ms.sym)
+ scnprintf(bf, bfsize, "%s", cl->ms.sym->name);
+ else
+ scnprintf(bf, bfsize, "%#" PRIx64, cl->ip);
+}
+
+static void perf_gtk__add_callchain(struct rb_root *root, GtkTreeStore *store,
+ GtkTreeIter *parent, int col)
+{
+ struct rb_node *nd;
+ bool has_single_node = (rb_first(root) == rb_last(root));
+
+ for (nd = rb_first(root); nd; nd = rb_next(nd)) {
+ struct callchain_node *node;
+ struct callchain_list *chain;
+ GtkTreeIter iter, new_parent;
+ bool need_new_parent;
+
+ node = rb_entry(nd, struct callchain_node, rb_node);
+
+ new_parent = *parent;
+ need_new_parent = !has_single_node && (node->val_nr > 1);
+
+ list_for_each_entry(chain, &node->val, list) {
+ char buf[128];
+
+ gtk_tree_store_append(store, &iter, &new_parent);
+
+ callchain_list__sym_name(chain, buf, sizeof(buf));
+ gtk_tree_store_set(store, &iter, col, buf, -1);
+
+ if (need_new_parent) {
+ /*
+ * Only show the top-most symbol in a callchain
+ * if it's not the only callchain.
+ */
+ new_parent = iter;
+ need_new_parent = false;
+ }
+ }
+
+ /* Now 'iter' contains info of the last callchain_list */
+ perf_gtk__add_callchain(&node->rb_root, store, &iter, col);
+ }
+}
+
static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
float min_pcnt)
{
@@ -135,6 +184,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
struct rb_node *nd;
GtkWidget *view;
int col_idx;
+ int sym_col = -1;
int nr_cols;
char s[512];
@@ -153,6 +203,9 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
if (se->elide)
continue;
+ if (se == &sort_sym)
+ sym_col = nr_cols;
+
col_types[nr_cols++] = G_TYPE_STRING;
}
@@ -183,6 +236,13 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
col_idx++, NULL);
}
+ if (symbol_conf.use_callchain && sort__has_sym) {
+ GtkTreeViewColumn *column;
+
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), sym_col);
+ 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));
@@ -221,6 +281,11 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
gtk_tree_store_set(store, &iter, col_idx++, s, -1);
}
+
+ if (symbol_conf.use_callchain && sort__has_sym) {
+ perf_gtk__add_callchain(&h->sorted_chain, store, &iter,
+ sym_col);
+ }
}
gtk_container_add(GTK_CONTAINER(window), view);
next prev parent reply other threads:[~2013-07-19 7:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 9:22 [PATCHSET 0/6] perf report: Add support for callchains on GTK browser (v2) Namhyung Kim
2013-06-04 9:22 ` [PATCH 1/6] perf gtk/hists: Use GtkTreeStore instead of GtkListStore Namhyung Kim
2013-07-19 7:48 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-06-04 9:22 ` [PATCH 2/6] perf gtk/hists: Add support for callchains Namhyung Kim
2013-06-04 9:34 ` Pekka Enberg
2013-07-19 7:48 ` tip-bot for Namhyung Kim [this message]
2013-06-04 9:22 ` [PATCH 3/6] perf gtk/hists: Display callchain overhead also Namhyung Kim
2013-06-04 9:35 ` Pekka Enberg
2013-07-19 7:48 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-06-04 9:22 ` [PATCH 4/6] perf gtk/hists: Make column headers resizable Namhyung Kim
2013-07-19 7:48 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-06-04 9:22 ` [PATCH 5/6] perf gtk/hists: Add a double-click handler for callchains Namhyung Kim
2013-07-19 7:48 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-06-04 9:22 ` [PATCH 6/6] perf gtk/hists: Set rules hint for the hist browser Namhyung Kim
2013-06-04 9:35 ` Pekka Enberg
2013-07-19 7:49 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-07-04 8:39 ` [PATCHSET 0/6] perf report: Add support for callchains on GTK browser (v2) Namhyung Kim
2013-07-05 15:04 ` 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=tip-2bbc5874251830fee170a0fc97fa5788717d2fd9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=penberg@kernel.org \
--cc=tglx@linutronix.de \
/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