diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-06-19 16:30:20 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-06-19 16:30:20 -0400 |
commit | 5f00b0f45bc3f1e77f0db0e915fd3302db669914 (patch) | |
tree | a7cee8263e6b00080ac915273bef04bccf2fa0ea | |
parent | 516e536849d26a2bcacd9050f4a7222a14c0f9e4 (diff) |
perf hists browser: Honour the help line provided by builtin-{top,report}.c
The hists_browser was replacing whatever helpline provided by 'top' or
'report' with a static "Press '?' for help on key bindings", fix it.
Now the message passed by top appears at the bottom of the screen:
"For a higher level overview, try: perf top --sort comm,dso"
As well the message that will be added when the user presses 'f' to
disable the events, something along the lines of "press f again to
re-enable...".
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-dacaja70mbfz3a0yj1n180gx@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/ui/browsers/hists.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 79a093a7d221..e2b500b26527 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c | |||
@@ -424,7 +424,7 @@ static void ui_browser__warn_lost_events(struct ui_browser *browser) | |||
424 | "Or reduce the sampling frequency."); | 424 | "Or reduce the sampling frequency."); |
425 | } | 425 | } |
426 | 426 | ||
427 | static int hist_browser__run(struct hist_browser *browser) | 427 | static int hist_browser__run(struct hist_browser *browser, const char *help) |
428 | { | 428 | { |
429 | int key; | 429 | int key; |
430 | char title[160]; | 430 | char title[160]; |
@@ -436,8 +436,7 @@ static int hist_browser__run(struct hist_browser *browser) | |||
436 | 436 | ||
437 | hists__browser_title(browser->hists, hbt, title, sizeof(title)); | 437 | hists__browser_title(browser->hists, hbt, title, sizeof(title)); |
438 | 438 | ||
439 | if (ui_browser__show(&browser->b, title, | 439 | if (ui_browser__show(&browser->b, title, help) < 0) |
440 | "Press '?' for help on key bindings") < 0) | ||
441 | return -1; | 440 | return -1; |
442 | 441 | ||
443 | while (1) { | 442 | while (1) { |
@@ -1773,7 +1772,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, | |||
1773 | 1772 | ||
1774 | nr_options = 0; | 1773 | nr_options = 0; |
1775 | 1774 | ||
1776 | key = hist_browser__run(browser); | 1775 | key = hist_browser__run(browser, helpline); |
1777 | 1776 | ||
1778 | if (browser->he_selection != NULL) { | 1777 | if (browser->he_selection != NULL) { |
1779 | thread = hist_browser__selected_thread(browser); | 1778 | thread = hist_browser__selected_thread(browser); |