From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 4/8] perf tools: Introduce struct hist_browser title callback
Date: Mon, 20 Jun 2016 23:58:15 +0200 [thread overview]
Message-ID: <1466459899-1166-5-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1466459899-1166-1-git-send-email-jolsa@kernel.org>
We can now setup title callback for hist_browser,
which will be useful in following changes to
create customized hist_browsers.
This also separates struct perf_evsel dependency
out of hist_browser basic code.
Link: http://lkml.kernel.org/n/tip-5v3wd2r5njgnokbnz4nxfg4v@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/ui/browsers/hists.c | 21 +++++++++++++--------
tools/perf/ui/browsers/hists.h | 4 ++++
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 539b69065d9d..a74cbd381607 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -21,9 +21,8 @@
extern void hist_browser__init_hpp(void);
-static int hists__browser_title(struct hists *hists,
- struct hist_browser_timer *hbt,
- char *bf, size_t size);
+static int perf_evsel_browser_title(struct hist_browser *browser,
+ char *bf, size_t size);
static void hist_browser__update_nr_entries(struct hist_browser *hb);
static struct rb_node *hists__filter_entries(struct rb_node *nd,
@@ -568,6 +567,11 @@ static void ui_browser__warn_lost_events(struct ui_browser *browser)
"Or reduce the sampling frequency.");
}
+static int hist_browser__title(struct hist_browser *browser, char *bf, size_t size)
+{
+ return browser->title ? browser->title(browser, bf, size) : 0;
+}
+
int hist_browser__run(struct hist_browser *browser, const char *help)
{
int key;
@@ -578,7 +582,7 @@ int hist_browser__run(struct hist_browser *browser, const char *help)
browser->b.entries = &browser->hists->entries;
browser->b.nr_entries = hist_browser__nr_entries(browser);
- hists__browser_title(browser->hists, hbt, title, sizeof(title));
+ hist_browser__title(browser, title, sizeof(title));
if (ui_browser__show(&browser->b, title, "%s", help) < 0)
return -1;
@@ -604,8 +608,7 @@ int hist_browser__run(struct hist_browser *browser, const char *help)
ui_browser__warn_lost_events(&browser->b);
}
- hists__browser_title(browser->hists,
- hbt, title, sizeof(title));
+ hist_browser__title(browser, title, sizeof(title));
ui_browser__show_title(&browser->b, title);
continue;
}
@@ -2054,6 +2057,7 @@ struct hist_browser *hist_browser__new(struct hists *hists,
browser->show_headers = symbol_conf.show_hist_headers;
browser->hbt = hbt;
browser->env = env;
+ browser->title = perf_evsel_browser_title;
}
return browser;
@@ -2080,10 +2084,11 @@ static inline bool is_report_browser(void *timer)
return timer == NULL;
}
-static int hists__browser_title(struct hists *hists,
- struct hist_browser_timer *hbt,
+static int perf_evsel_browser_title(struct hist_browser *browser,
char *bf, size_t size)
{
+ struct hist_browser_timer *hbt = browser->hbt;
+ struct hists *hists = browser->hists;
char unit;
int printed;
const struct dso *dso = hists->dso_filter;
diff --git a/tools/perf/ui/browsers/hists.h b/tools/perf/ui/browsers/hists.h
index 57b7764800b7..cf9d04928ccc 100644
--- a/tools/perf/ui/browsers/hists.h
+++ b/tools/perf/ui/browsers/hists.h
@@ -18,6 +18,10 @@ struct hist_browser {
u64 nr_non_filtered_entries;
u64 nr_hierarchy_entries;
u64 nr_callchain_rows;
+
+ /* Get title string. */
+ int (*title)(struct hist_browser *browser,
+ char *bf, size_t size);
};
struct hist_browser *hist_browser__new(struct hists *hists,
--
2.4.11
next prev parent reply other threads:[~2016-06-20 22:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 21:58 [PATCH 0/8] perf tools: Various fixes Jiri Olsa
2016-06-20 21:58 ` [PATCH 1/8] perf tools: Rename __hists__add_entry to hists__add_entry Jiri Olsa
2016-06-20 21:58 ` [PATCH 2/8] perf tools: Move hist_browser into header file Jiri Olsa
2016-06-26 10:49 ` [tip:perf/core] perf hists browser: " tip-bot for Jiri Olsa
2016-06-20 21:58 ` [PATCH 3/8] perf tools: Make hist_browser__(new|delete|run) public Jiri Olsa
2016-06-26 10:50 ` [tip:perf/core] perf hists browser: Make (new|delete|run) public tip-bot for Jiri Olsa
2016-06-20 21:58 ` Jiri Olsa [this message]
2016-06-26 10:50 ` [tip:perf/core] perf hists browser: Introduce struct hist_browser title callback tip-bot for Jiri Olsa
2016-06-20 21:58 ` [PATCH 5/8] perf tools: Move horizontal scroll init into hist_browser__new Jiri Olsa
2016-06-26 10:51 ` [tip:perf/core] perf hists browser: Move horizontal scroll init to new() tip-bot for Jiri Olsa
2016-06-20 21:58 ` [PATCH 6/8] perf tools: Introduce perf_evsel_browser_new function Jiri Olsa
2016-06-26 10:51 ` [tip:perf/core] perf hists browser: Introduce perf_evsel_browser constructor tip-bot for Jiri Olsa
2016-06-20 21:58 ` [PATCH 7/8] perf tools: Introduce hist_browser__init Jiri Olsa
2016-06-26 10:52 ` [tip:perf/core] perf hists browser: Introduce init() tip-bot for Jiri Olsa
2016-06-20 21:58 ` [PATCH 8/8] perf tools: Enlarge pid sort entry size Jiri Olsa
2016-06-26 10:52 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
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=1466459899-1166-5-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.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