From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756670AbbFSXRb (ORCPT ); Fri, 19 Jun 2015 19:17:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52770 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756634AbbFSXRW (ORCPT ); Fri, 19 Jun 2015 19:17:22 -0400 Date: Fri, 19 Jun 2015 16:17:07 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: acme@redhat.com, dzickus@redhat.com, eranian@google.com, fweisbec@gmail.com, mingo@kernel.org, dsahern@gmail.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, hpa@zytor.com, bp@suse.de, jolsa@redhat.com Reply-To: tglx@linutronix.de, jolsa@redhat.com, bp@suse.de, hpa@zytor.com, dsahern@gmail.com, mingo@kernel.org, dzickus@redhat.com, fweisbec@gmail.com, eranian@google.com, acme@redhat.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Honour the help line provided by builtin-{top,report}.c Git-Commit-ID: 5f00b0f45bc3f1e77f0db0e915fd3302db669914 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5f00b0f45bc3f1e77f0db0e915fd3302db669914 Gitweb: http://git.kernel.org/tip/5f00b0f45bc3f1e77f0db0e915fd3302db669914 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 19 Jun 2015 17:30:20 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-dacaja70mbfz3a0yj1n180gx@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 79a093a7..e2b500b 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) "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/