From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759577AbcJTPFH (ORCPT ); Thu, 20 Oct 2016 11:05:07 -0400 Received: from merlin.infradead.org ([205.233.59.134]:40616 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758476AbcJTPFB (ORCPT ); Thu, 20 Oct 2016 11:05:01 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Linux Weekly News , Jiri Olsa , Andi Kleen , David Ahern , Don Zickus , Joe Mario , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 49/52] perf c2c report: Add help windows Date: Thu, 20 Oct 2016 12:04:33 -0300 Message-Id: <1476975876-2522-50-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476975876-2522-1-git-send-email-acme@kernel.org> References: <1476975876-2522-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by merlin.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa Adding help windows to display key/action mappings for both browsers. Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: David Ahern Cc: Don Zickus Cc: Joe Mario Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/n/tip-zni4apopx6a9eyxsosm1ebh1@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-c2c.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 27eef205a774..3fc18264d4d1 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -2181,6 +2181,11 @@ static int perf_c2c__browse_cacheline(struct hist_entry *he) struct c2c_cacheline_browser *cl_browser; struct hist_browser *browser; int key = -1; + const char help[] = + " ENTER Togle callchains (if present) \n" + " n Togle Node details info \n" + " s Togle full lenght of symbol and source line columns \n" + " q Return back to cacheline list \n"; /* Display compact version first. */ c2c.symbol_full = false; @@ -2201,7 +2206,7 @@ static int perf_c2c__browse_cacheline(struct hist_entry *he) c2c_browser__update_nr_entries(browser); while (1) { - key = hist_browser__run(browser, "help"); + key = hist_browser__run(browser, "? - help"); switch (key) { case 's': @@ -2213,6 +2218,9 @@ static int perf_c2c__browse_cacheline(struct hist_entry *he) break; case 'q': goto out; + case '?': + ui_browser__help_window(&browser->b, help); + break; default: break; } @@ -2251,6 +2259,10 @@ static int perf_c2c__hists_browse(struct hists *hists) { struct hist_browser *browser; int key = -1; + const char help[] = + " d Display cacheline details \n" + " ENTER Togle callchains (if present) \n" + " q Quit \n"; browser = perf_c2c_browser__new(hists); if (browser == NULL) @@ -2263,7 +2275,7 @@ static int perf_c2c__hists_browse(struct hists *hists) c2c_browser__update_nr_entries(browser); while (1) { - key = hist_browser__run(browser, "help"); + key = hist_browser__run(browser, "? - help"); switch (key) { case 'q': @@ -2271,6 +2283,9 @@ static int perf_c2c__hists_browse(struct hists *hists) case 'd': perf_c2c__browse_cacheline(browser->he_selection); break; + case '?': + ui_browser__help_window(&browser->b, help); + break; default: break; } -- 2.7.4