openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf hists browser: Introduce struct hist_browser title callback 

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.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1466459899-1166-5-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2016-06-20 23:58:15 +02:00 committed by Arnaldo Carvalho de Melo
parent dabd201239
commit 5b91a86f47
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/perf/ui/browsers/hists.c
View File

@ -21,8 +21,7 @@
extern void hist_browser__init_hpp(void); extern void hist_browser__init_hpp(void);
static int hists__browser_title(struct hists *hists, static int perf_evsel_browser_title(struct hist_browser *browser,
struct hist_browser_timer *hbt,
char *bf, size_t size); char *bf, size_t size);
static void hist_browser__update_nr_entries(struct hist_browser *hb); static void hist_browser__update_nr_entries(struct hist_browser *hb);
@ -568,6 +567,11 @@ static void ui_browser__warn_lost_events(struct ui_browser *browser)
"Or reduce the sampling frequency."); "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 hist_browser__run(struct hist_browser *browser, const char *help)
{ {
int key; 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.entries = &browser->hists->entries;
browser->b.nr_entries = hist_browser__nr_entries(browser); 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) if (ui_browser__show(&browser->b, title, "%s", help) < 0)
return -1; return -1;
@ -604,8 +608,7 @@ int hist_browser__run(struct hist_browser *browser, const char *help)
ui_browser__warn_lost_events(&browser->b); ui_browser__warn_lost_events(&browser->b);
} }
hists__browser_title(browser->hists, hist_browser__title(browser, title, sizeof(title));
hbt, title, sizeof(title));
ui_browser__show_title(&browser->b, title); ui_browser__show_title(&browser->b, title);
continue; continue;
} }
@ -2054,6 +2057,7 @@ struct hist_browser *hist_browser__new(struct hists *hists,
browser->show_headers = symbol_conf.show_hist_headers; browser->show_headers = symbol_conf.show_hist_headers;
browser->hbt = hbt; browser->hbt = hbt;
browser->env = env; browser->env = env;
browser->title = perf_evsel_browser_title;
} }
return browser; return browser;
@ -2080,10 +2084,11 @@ static inline bool is_report_browser(void *timer)
return timer == NULL; return timer == NULL;
} }
static int hists__browser_title(struct hists *hists, static int perf_evsel_browser_title(struct hist_browser *browser,
struct hist_browser_timer *hbt,
char *bf, size_t size) char *bf, size_t size)
{ {
struct hist_browser_timer *hbt = browser->hbt;
struct hists *hists = browser->hists;
char unit; char unit;
int printed; int printed;
const struct dso *dso = hists->dso_filter; const struct dso *dso = hists->dso_filter;

4
tools/perf/ui/browsers/hists.h
View File

@ -18,6 +18,10 @@ struct hist_browser {
u64 nr_non_filtered_entries; u64 nr_non_filtered_entries;
u64 nr_hierarchy_entries; u64 nr_hierarchy_entries;
u64 nr_callchain_rows; 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, struct hist_browser *hist_browser__new(struct hists *hists,