lkml.org 
[lkml]   [2016]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 46/61] perf c2c report: Add main browser
Date
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 | 99 +++++++++++++++++++++++++++++++++++++++++-
tools/perf/ui/browsers/hists.c | 2 +-
tools/perf/ui/browsers/hists.h | 1 +
3 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 222b1a34c788..47d5408aeff8 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;
@@ -1077,6 +1079,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",
@@ -1808,6 +1812,84 @@ static void perf_c2c__hists_fprintf(FILE *out)
print_pareto(out);
}

+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 ui_quirks(bool stdio)
+{
+ if (!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;
@@ -1824,6 +1906,8 @@ 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)"),
+ OPT_BOOLEAN(0, "stdio", &c2c.use_stdio,
+ "Use the stdio interface"),
OPT_END()
};
int err = 0;
@@ -1833,6 +1917,15 @@ 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;
+
+ ui_quirks(c2c.use_stdio);
+
+ setup_browser(false);
+
if (!input_name || !strlen(input_name))
input_name = "perf.data";

@@ -1892,8 +1985,10 @@ static int perf_c2c__report(int argc, const char **argv)

ui_progress__finish();

- use_browser = 0;
- perf_c2c__hists_fprintf(stdout);
+ if (c2c.use_stdio)
+ perf_c2c__hists_fprintf(stdout);
+ else
+ perf_c2c__hists_browse(&c2c.hists.hists);

out_session:
perf_session__delete(session);
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 77cf7a80e8d6..83fd2885d78a 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
\
 
 \ /
  Last update: 2016-09-19 15:17    [W:0.463 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site