From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Don Zickus <dzickus@redhat.com>, Joe Mario <jmario@redhat.com>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>, Andi Kleen <andi@firstfloor.org>
Subject: [PATCH 43/57] perf c2c report: Add main browser
Date: Thu, 22 Sep 2016 17:37:11 +0200 [thread overview]
Message-ID: <1474558645-19956-44-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1474558645-19956-1-git-send-email-jolsa@kernel.org>
Adding the main cachelines TUI browser. It allows
to navigate through cachelines and disaplay their
details and callchains (implemented in following
patches).
Link: http://lkml.kernel.org/n/tip-inykbom2f19difvsu1e18avr@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-c2c.c | 117 ++++++++++++++++++++++++++++++++++++++++-
tools/perf/ui/browsers/hists.c | 2 +-
tools/perf/ui/browsers/hists.h | 1 +
3 files changed, 117 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index add27479cc23..48f926768a59 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -14,6 +14,7 @@
#include "data.h"
#include "sort.h"
#include <asm/bug.h>
+#include "ui/browsers/hists.h"
struct c2c_hists {
struct hists hists;
@@ -53,6 +54,7 @@ struct perf_c2c {
int node_info;
bool show_src;
+ bool use_stdio;
};
static struct perf_c2c c2c;
@@ -654,6 +656,10 @@ percent_color(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
c2c_he = container_of(he, struct c2c_hist_entry, he);
per = get_percent(c2c_he);
+#ifdef HAVE_SLANG_SUPPORT
+ if (use_browser)
+ return __hpp__slsmg_color_printf(hpp, "%*.2f%%", width - 1, per);
+#endif
return hpp_color_scnprintf(hpp, "%*.2f%%", width - 1, per);
}
@@ -1074,6 +1080,8 @@ static struct c2c_dimension dim_dcacheline = {
.width = 18,
};
+static struct c2c_header header_offset_tui = HEADER_LOW("Off");
+
static struct c2c_dimension dim_offset = {
.header = HEADER_BOTH("Data address", "Offset"),
.name = "offset",
@@ -1800,6 +1808,100 @@ static void perf_c2c__hists_fprintf(FILE *out)
print_pareto(out);
}
+#ifdef HAVE_SLANG_SUPPORT
+static void c2c_browser__update_nr_entries(struct hist_browser *hb)
+{
+ u64 nr_entries = 0;
+ struct rb_node *nd = rb_first(&hb->hists->entries);
+
+ do {
+ struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);
+
+ if (!he->filtered)
+ nr_entries++;
+
+ nd = rb_next(nd);
+ } while (nd);
+
+ hb->nr_non_filtered_entries = nr_entries;
+}
+
+static int perf_c2c_browser__title(struct hist_browser *browser,
+ char *bf, size_t size)
+{
+ scnprintf(bf, size,
+ "Shared Data Cache Line Table "
+ "(%lu entries)", browser->nr_non_filtered_entries);
+ return 0;
+}
+
+static struct hist_browser*
+perf_c2c_browser__new(struct hists *hists)
+{
+ struct hist_browser *browser = hist_browser__new(hists);
+
+ if (browser) {
+ browser->title = perf_c2c_browser__title;
+ browser->c2c_filter = true;
+ }
+
+ return browser;
+}
+
+static int perf_c2c__hists_browse(struct hists *hists)
+{
+ struct hist_browser *browser;
+ int key = -1;
+
+ browser = perf_c2c_browser__new(hists);
+ if (browser == NULL)
+ return -1;
+
+ /* reset abort key so that it can get Ctrl-C as a key */
+ SLang_reset_tty();
+ SLang_init_tty(0, 0, 0);
+
+ c2c_browser__update_nr_entries(browser);
+
+ while (1) {
+ key = hist_browser__run(browser, "help");
+
+ switch (key) {
+ case 'q':
+ goto out;
+ default:
+ break;
+ }
+ }
+
+out:
+ hist_browser__delete(browser);
+ return 0;
+}
+
+static void perf_c2c_display(void)
+{
+ if (c2c.use_stdio)
+ perf_c2c__hists_fprintf(stdout);
+ else
+ perf_c2c__hists_browse(&c2c.hists.hists);
+}
+#else
+static void perf_c2c_display(void)
+{
+ use_browser = 0;
+ perf_c2c__hists_fprintf(stdout);
+}
+#endif /* HAVE_SLANG_SUPPORT */
+
+static void ui_quirks(void)
+{
+ if (!c2c.use_stdio) {
+ dim_offset.width = 5;
+ dim_offset.header = header_offset_tui;
+ }
+}
+
static int perf_c2c__report(int argc, const char **argv)
{
struct perf_session *session;
@@ -1816,6 +1918,9 @@ static int perf_c2c__report(int argc, const char **argv)
"the input file to process"),
OPT_INCR('N', "node-info", &c2c.node_info,
"show extra node info in report (repeat for more info)"),
+#ifdef HAVE_SLANG_SUPPORT
+ OPT_BOOLEAN(0, "stdio", &c2c.use_stdio, "Use the stdio interface"),
+#endif
OPT_END()
};
int err = 0;
@@ -1825,6 +1930,13 @@ static int perf_c2c__report(int argc, const char **argv)
if (argc)
usage_with_options(report_c2c_usage, c2c_options);
+ if (c2c.use_stdio)
+ use_browser = 0;
+ else
+ use_browser = 1;
+
+ setup_browser(false);
+
if (!input_name || !strlen(input_name))
input_name = "perf.data";
@@ -1883,8 +1995,9 @@ static int perf_c2c__report(int argc, const char **argv)
ui_progress__finish();
- use_browser = 0;
- perf_c2c__hists_fprintf(stdout);
+ ui_quirks();
+
+ perf_c2c_display();
out_session:
perf_session__delete(session);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index fb8e42c7507a..fb9795a1b638 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -30,7 +30,7 @@ static struct rb_node *hists__filter_entries(struct rb_node *nd,
static bool hist_browser__has_filter(struct hist_browser *hb)
{
- return hists__has_filter(hb->hists) || hb->min_pcnt || symbol_conf.has_filter;
+ return hists__has_filter(hb->hists) || hb->min_pcnt || symbol_conf.has_filter || hb->c2c_filter;
}
static int hist_browser__get_folding(struct hist_browser *browser)
diff --git a/tools/perf/ui/browsers/hists.h b/tools/perf/ui/browsers/hists.h
index 39bd0f28f211..23d6acb84800 100644
--- a/tools/perf/ui/browsers/hists.h
+++ b/tools/perf/ui/browsers/hists.h
@@ -18,6 +18,7 @@ struct hist_browser {
u64 nr_non_filtered_entries;
u64 nr_hierarchy_entries;
u64 nr_callchain_rows;
+ bool c2c_filter;
/* Get title string. */
int (*title)(struct hist_browser *browser,
--
2.7.4
next prev parent reply other threads:[~2016-09-22 15:39 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 15:36 [PATCHv4 00/57] perf c2c: Add new tool to analyze cacheline contention on NUMA systems Jiri Olsa
2016-09-22 15:36 ` [PATCH 01/57] perf tools: Add __hist_entry__snprintf function Jiri Olsa
2016-09-22 15:50 ` Arnaldo Carvalho de Melo
2016-09-23 5:28 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 02/57] perf tools: Introduce c2c_decode_stats function Jiri Olsa
2016-10-22 8:31 ` [tip:perf/core] perf c2c: " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 03/57] perf tools: Introduce c2c_add_stats function Jiri Olsa
2016-10-22 8:31 ` [tip:perf/core] perf c2c: " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 04/57] perf tools: Make reset_dimensions global Jiri Olsa
2016-09-22 15:50 ` Arnaldo Carvalho de Melo
2016-09-23 5:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 05/57] perf tools: Make output_field_add and sort_dimension__add global Jiri Olsa
2016-09-22 15:50 ` Arnaldo Carvalho de Melo
2016-09-23 5:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 06/57] perf tools: Make several sorting functions global Jiri Olsa
2016-09-22 15:50 ` Arnaldo Carvalho de Melo
2016-09-23 5:29 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 07/57] perf tools: Make several display " Jiri Olsa
2016-09-22 15:50 ` Arnaldo Carvalho de Melo
2016-09-23 5:30 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 08/57] perf tools: Make __hist_entry__snprintf function global Jiri Olsa
2016-09-22 15:50 ` Arnaldo Carvalho de Melo
2016-09-23 5:30 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 09/57] perf tools: Make hists__fprintf_headers " Jiri Olsa
2016-09-22 15:51 ` Arnaldo Carvalho de Melo
2016-09-23 5:31 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 10/57] perf c2c: Add c2c command Jiri Olsa
2016-10-22 8:32 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 11/57] perf c2c: Add record subcommand Jiri Olsa
2016-10-22 8:32 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 12/57] perf c2c: Add report subcommand Jiri Olsa
2016-10-22 8:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 13/57] perf c2c report: Add dimension support Jiri Olsa
2016-10-22 8:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 14/57] perf c2c report: Add sort_entry " Jiri Olsa
2016-10-22 8:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 15/57] perf c2c report: Fallback to standard dimensions Jiri Olsa
2016-10-22 8:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 16/57] perf c2c report: Add sample processing Jiri Olsa
2016-10-22 8:35 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 17/57] perf c2c report: Add cacheline hists processing Jiri Olsa
2016-10-22 8:35 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 18/57] perf c2c report: Decode c2c_stats for hist entries Jiri Olsa
2016-10-22 8:36 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 19/57] perf c2c report: Add header macros Jiri Olsa
2016-10-22 8:36 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 20/57] perf c2c report: Add dcacheline dimension key Jiri Olsa
2016-10-04 16:50 ` Arnaldo Carvalho de Melo
2016-10-04 22:46 ` Jiri Olsa
2016-10-05 10:45 ` Arnaldo Carvalho de Melo
2016-10-05 10:50 ` Arnaldo Carvalho de Melo
2016-10-05 12:38 ` Jiri Olsa
2016-10-05 13:21 ` Arnaldo Carvalho de Melo
2016-10-05 11:01 ` Arnaldo Carvalho de Melo
2016-10-05 11:05 ` Arnaldo Carvalho de Melo
2016-10-05 12:45 ` Jiri Olsa
2016-10-05 13:09 ` Jiri Olsa
2016-10-05 13:26 ` Arnaldo Carvalho de Melo
2016-10-05 13:38 ` Jiri Olsa
2016-10-05 14:02 ` Jiri Olsa
2016-10-05 13:23 ` Arnaldo Carvalho de Melo
2016-10-22 8:37 ` [tip:perf/core] perf c2c report: Add 'dcacheline' " tip-bot for Jiri Olsa
2016-09-22 15:36 ` [PATCH 21/57] perf c2c report: Add offset " Jiri Olsa
2016-10-05 10:57 ` Arnaldo Carvalho de Melo
2016-10-05 12:11 ` Jiri Olsa
2016-09-22 15:36 ` [PATCH 22/57] perf c2c report: Add iaddr " Jiri Olsa
2016-09-22 15:36 ` [PATCH 23/57] perf c2c report: Add hitm related dimension keys Jiri Olsa
2016-09-22 15:36 ` [PATCH 24/57] perf c2c report: Add stores " Jiri Olsa
2016-09-22 15:36 ` [PATCH 25/57] perf c2c report: Add loads " Jiri Olsa
2016-09-22 15:36 ` [PATCH 26/57] perf c2c report: Add llc and remote " Jiri Olsa
2016-09-22 15:36 ` [PATCH 27/57] perf c2c report: Add llc load miss dimension key Jiri Olsa
2016-09-22 15:36 ` [PATCH 28/57] perf c2c report: Add total record sort key Jiri Olsa
2016-09-22 15:36 ` [PATCH 29/57] perf c2c report: Add total loads " Jiri Olsa
2016-09-22 15:36 ` [PATCH 30/57] perf c2c report: Add hitm percent " Jiri Olsa
2016-09-22 15:36 ` [PATCH 31/57] perf c2c report: Add hitm/store percent related sort keys Jiri Olsa
2016-09-22 15:37 ` [PATCH 32/57] perf c2c report: Add dram " Jiri Olsa
2016-09-22 15:37 ` [PATCH 33/57] perf c2c report: Add pid sort key Jiri Olsa
2016-09-22 15:37 ` [PATCH 34/57] perf c2c report: Add tid " Jiri Olsa
2016-09-22 15:37 ` [PATCH 35/57] perf c2c report: Add symbol and dso sort keys Jiri Olsa
2016-09-22 15:37 ` [PATCH 36/57] perf c2c report: Add node sort key Jiri Olsa
2016-09-22 15:37 ` [PATCH 37/57] perf c2c report: Add stats related sort keys Jiri Olsa
2016-09-22 15:37 ` [PATCH 38/57] perf c2c report: Add cpu cnt sort key Jiri Olsa
2016-09-22 15:37 ` [PATCH 39/57] perf c2c report: Add src line " Jiri Olsa
2016-10-10 16:47 ` Arnaldo Carvalho de Melo
2016-09-22 15:37 ` [PATCH 40/57] perf c2c report: Setup number of header lines for hists Jiri Olsa
2016-09-22 15:37 ` [PATCH 41/57] perf c2c report: Set final resort fields Jiri Olsa
2016-09-22 15:37 ` [PATCH 42/57] perf c2c report: Add stdio output support Jiri Olsa
2016-09-22 15:37 ` Jiri Olsa [this message]
2016-09-22 15:37 ` [PATCH 44/57] perf c2c report: Add cacheline browser Jiri Olsa
2016-09-22 15:37 ` [PATCH 45/57] perf c2c report: Add global stats stdio output Jiri Olsa
2016-09-22 15:37 ` [PATCH 46/57] perf c2c report: Add shared cachelines " Jiri Olsa
2016-09-22 15:37 ` [PATCH 47/57] perf c2c report: Add c2c related " Jiri Olsa
2016-09-22 15:37 ` [PATCH 48/57] perf c2c report: Allow to report callchains Jiri Olsa
2016-09-22 15:37 ` [PATCH 49/57] perf c2c report: Limit the cachelines table entries Jiri Olsa
2016-10-10 20:01 ` Arnaldo Carvalho de Melo
2016-10-11 9:22 ` Jiri Olsa
2016-09-22 15:37 ` [PATCH 50/57] perf c2c report: Add support to choose local HITMs Jiri Olsa
2016-09-22 15:37 ` [PATCH 51/57] perf c2c report: Allow to set cacheline sort fields Jiri Olsa
2016-09-22 15:37 ` [PATCH 52/57] perf c2c report: Recalc width of global sort entries Jiri Olsa
2016-09-22 15:37 ` [PATCH 53/57] perf c2c report: Add cacheline index entry Jiri Olsa
2016-09-22 15:37 ` [PATCH 54/57] perf c2c report: Add support to manage symbol name length Jiri Olsa
2016-09-22 15:37 ` [PATCH 55/57] perf c2c report: Iterate node display in browser Jiri Olsa
2016-09-22 15:37 ` [PATCH 56/57] perf c2c report: Add help windows Jiri Olsa
2016-09-22 15:37 ` [PATCH 57/57] perf c2c: Add man page and credits Jiri Olsa
2016-09-29 9:19 ` [PATCHv4 00/57] perf c2c: Add new tool to analyze cacheline contention on NUMA systems Peter Zijlstra
2016-09-29 14:54 ` Arnaldo Carvalho de Melo
2016-10-01 13:44 ` Joe Mario
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=1474558645-19956-44-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=dzickus@redhat.com \
--cc=jmario@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/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
Powered by JetHome