[PATCH 45/49] perf ui/tui: Split help message for perf top and report
From: Namhyung Kim Some hotkeys don't work for perf top so split help messages for them. It'll be helpful to a future modification. Also sort the message by alphabetical order of the hotkey. Signed-off-by: Namhyung Kim Cc: David Ahern Cc: Ingo Molnar Cc: Jiri Olsa Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1388036284-32342-3-git-send-email-namhy...@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 49 ++ 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index a440e03cd8c2..d43ec79ea4e3 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1400,6 +1400,35 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, char script_opt[64]; int delay_secs = hbt ? hbt->refresh : 0; +#define HIST_BROWSER_HELP_COMMON \ + "h/?/F1Show this window\n" \ + "UP/DOWN/PGUP\n"\ + "PGDN/SPACENavigate\n" \ + "q/ESC/CTRL+C Exit browser\n\n"\ + "For multiple event sessions:\n\n" \ + "TAB/UNTAB Switch events\n\n" \ + "For symbolic views (--sort has sym):\n\n" \ + "->Zoom into DSO/Threads & Annotate current symbol\n" \ + "<-Zoom out\n" \ + "a Annotate current symbol\n" \ + "C Collapse all callchains\n" \ + "d Zoom into current DSO\n" \ + "E Expand all callchains\n" \ + + /* help messages are sorted by lexical order of the hotkey */ + const char report_help[] = HIST_BROWSER_HELP_COMMON + "P Print histograms to perf.hist.N\n" + "r Run available scripts\n" + "s Switch to another data file in PWD\n" + "t Zoom into current Thread\n" + "V Verbose (DSO names in callchains, etc)\n" + "/ Filter symbol by name"; + const char top_help[] = HIST_BROWSER_HELP_COMMON + "P Print histograms to perf.hist.N\n" + "t Zoom into current Thread\n" + "V Verbose (DSO names in callchains, etc)\n" + "/ Filter symbol by name"; + if (browser == NULL) return -1; @@ -1488,25 +1517,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, case 'h': case '?': ui_browser__help_window(>b, - "h/?/F1Show this window\n" - "UP/DOWN/PGUP\n" - "PGDN/SPACENavigate\n" - "q/ESC/CTRL+C Exit browser\n\n" - "For multiple event sessions:\n\n" - "TAB/UNTAB Switch events\n\n" - "For symbolic views (--sort has sym):\n\n" - "->Zoom into DSO/Threads & Annotate current symbol\n" - "<-Zoom out\n" - "a Annotate current symbol\n" - "C Collapse all callchains\n" - "E Expand all callchains\n" - "d Zoom into current DSO\n" - "t Zoom into current Thread\n" - "r Run available scripts('perf report' only)\n" - "s Switch to another data file in PWD ('perf report' only)\n" - "P Print histograms to perf.hist.N\n" - "V Verbose (DSO names in callchains, etc)\n" - "/ Filter symbol by name"); + is_report_browser(hbt) ? report_help : top_help); continue; case K_ENTER: case K_RIGHT: -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 45/49] perf ui/tui: Split help message for perf top and report
From: Namhyung Kim namhyung@lge.com Some hotkeys don't work for perf top so split help messages for them. It'll be helpful to a future modification. Also sort the message by alphabetical order of the hotkey. Signed-off-by: Namhyung Kim namhy...@kernel.org Cc: David Ahern dsah...@gmail.com Cc: Ingo Molnar mi...@kernel.org Cc: Jiri Olsa jo...@redhat.com Cc: Paul Mackerras pau...@samba.org Cc: Peter Zijlstra a.p.zijls...@chello.nl Link: http://lkml.kernel.org/r/1388036284-32342-3-git-send-email-namhy...@kernel.org Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com --- tools/perf/ui/browsers/hists.c | 49 ++ 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index a440e03cd8c2..d43ec79ea4e3 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1400,6 +1400,35 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, char script_opt[64]; int delay_secs = hbt ? hbt-refresh : 0; +#define HIST_BROWSER_HELP_COMMON \ + h/?/F1Show this window\n \ + UP/DOWN/PGUP\n\ + PGDN/SPACENavigate\n \ + q/ESC/CTRL+C Exit browser\n\n\ + For multiple event sessions:\n\n \ + TAB/UNTAB Switch events\n\n \ + For symbolic views (--sort has sym):\n\n \ + -Zoom into DSO/Threads Annotate current symbol\n \ + -Zoom out\n \ + a Annotate current symbol\n \ + C Collapse all callchains\n \ + d Zoom into current DSO\n \ + E Expand all callchains\n \ + + /* help messages are sorted by lexical order of the hotkey */ + const char report_help[] = HIST_BROWSER_HELP_COMMON + P Print histograms to perf.hist.N\n + r Run available scripts\n + s Switch to another data file in PWD\n + t Zoom into current Thread\n + V Verbose (DSO names in callchains, etc)\n + / Filter symbol by name; + const char top_help[] = HIST_BROWSER_HELP_COMMON + P Print histograms to perf.hist.N\n + t Zoom into current Thread\n + V Verbose (DSO names in callchains, etc)\n + / Filter symbol by name; + if (browser == NULL) return -1; @@ -1488,25 +1517,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, case 'h': case '?': ui_browser__help_window(browser-b, - h/?/F1Show this window\n - UP/DOWN/PGUP\n - PGDN/SPACENavigate\n - q/ESC/CTRL+C Exit browser\n\n - For multiple event sessions:\n\n - TAB/UNTAB Switch events\n\n - For symbolic views (--sort has sym):\n\n - -Zoom into DSO/Threads Annotate current symbol\n - -Zoom out\n - a Annotate current symbol\n - C Collapse all callchains\n - E Expand all callchains\n - d Zoom into current DSO\n - t Zoom into current Thread\n - r Run available scripts('perf report' only)\n - s Switch to another data file in PWD ('perf report' only)\n - P Print histograms to perf.hist.N\n - V Verbose (DSO names in callchains, etc)\n - / Filter symbol by name); + is_report_browser(hbt) ? report_help : top_help); continue; case K_ENTER: case K_RIGHT: -- 1.8.1.4 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at