perf hists browser: Honour the help line provided by builtin-{top,report}.c

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jun 19, 2015 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2015-06-19 23:17 UTC #0 lore raw

Commit-ID:  5f00b0f45bc3f1e77f0db0e915fd3302db669914
Gitweb:     http://git.kernel.org/tip/5f00b0f45bc3f1e77f0db0e915fd3302db669914
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 19 Jun 2015 17:30:20 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 19 Jun 2015 17:30:20 -0300

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 <[email protected]>

Cc Borislav Petkov <[email protected]>

Cc David Ahern <[email protected]>

Cc Don Zickus <[email protected]>

Cc Frederic Weisbecker <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Stephane Eranian <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/ui/browsers/hists.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

tools/perf/ui/browsers/hists.c +3 -4

index 79a093a7..e2b500b 100644
@@ -424,7 +424,7 @@ static void ui_browser__warn_lost_events(struct ui_browser *browser)
 		"Or reduce the sampling frequency.");
 }
 
-static int hist_browser__run(struct hist_browser *browser)
+static int hist_browser__run(struct hist_browser *browser, const char *help)
 {
 	int key;
 	char title[160];

@@ -436,8 +436,7 @@ static int hist_browser__run(struct hist_browser *browser)
 
 	hists__browser_title(browser->hists, hbt, title, sizeof(title));
 
-	if (ui_browser__show(&browser->b, title,
-			     "Press '?' for help on key bindings") < 0)
+	if (ui_browser__show(&browser->b, title, help) < 0)
 		return -1;
 
 	while (1) {

@@ -1773,7 +1772,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
 
 		nr_options = 0;
 
-		key = hist_browser__run(browser);
+		key = hist_browser__run(browser, helpline);
 
 		if (browser->he_selection != NULL) {
 			thread = hist_browser__selected_thread(browser);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/