Em Thu, Dec 26, 2013 at 11:05:21AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Thu, Dec 26, 2013 at 02:37:58PM +0900, Namhyung Kim escreveu: > > 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.
> > +++ 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/?/F1 Show this window\n" \ > > + "UP/DOWN/PGUP\n" \ > > + "PGDN/SPACE Navigate\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; > > This wastes space, why not have the HIST_BROWSER_HELP_COMMON as a > > const char common_help[] = ... > > and then use: > ui_browser__help(..., "%s%s", common_help, > is_report_browser(hbt) ? report_help : > top_help); > > ? Because ui__help_window doesn't support va_arg, ok, applying this one and later we can remove this space wastage when we make it support variadic arguments. - Arnaldo -- 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/
