perf report/top: Make ENTER consistently bring up menu

When callchains are present the ENTER key switches from bringing up the
menu that offers Annotation, Zoom by DSO, etc to expanding/collapsing
one callchain level, causing confusion, fix it by making it consistently
bring up the menu and use '+' to expand/collapse one callchain level.

Next patch will also add an entry to the menu to allow
expanding/collapsing, so that people used to ENTER expanding one
callchain level can quickly find it and use it instead.
Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-bjz35omktig8cwn6lbj1ifns@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3f777403
...@@ -706,7 +706,7 @@ int hist_browser__run(struct hist_browser *browser, const char *help, ...@@ -706,7 +706,7 @@ int hist_browser__run(struct hist_browser *browser, const char *help,
browser->show_headers = !browser->show_headers; browser->show_headers = !browser->show_headers;
hist_browser__update_rows(browser); hist_browser__update_rows(browser);
break; break;
case K_ENTER: case '+':
if (hist_browser__toggle_fold(browser)) if (hist_browser__toggle_fold(browser))
break; break;
/* fall thru */ /* fall thru */
...@@ -2858,6 +2858,7 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events, ...@@ -2858,6 +2858,7 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events,
"For symbolic views (--sort has sym):\n\n" \ "For symbolic views (--sort has sym):\n\n" \
"ENTER Zoom into DSO/Threads & Annotate current symbol\n" \ "ENTER Zoom into DSO/Threads & Annotate current symbol\n" \
"ESC Zoom out\n" \ "ESC Zoom out\n" \
"+ Expand/Collapse one callchain level\n" \
"a Annotate current symbol\n" \ "a Annotate current symbol\n" \
"C Collapse all callchains\n" \ "C Collapse all callchains\n" \
"d Zoom into current DSO\n" \ "d Zoom into current DSO\n" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment