perf report/top: Allow pressing hotkeys in the options popup menu
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 4c8b9c0f4281c8517542c26425aade3a31988575 Gitweb: https://git.kernel.org/tip/4c8b9c0f4281c8517542c26425aade3a31988575 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 16 Dec 2019 13:27:47 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 06 Jan 2020 11:46:10 -03:00
perf report/top: Allow pressing hotkeys in the options popup menu
When the users presses ENTER in the main 'perf report/top' screen a popup menu is presented, in it some hotkeys are suggested as alternatives to using the menu, or for additional features.
At that point the user may try those hotkeys, so allow for that by recording the key used and exiting, the caller then can check for that possibility and process the hotkey.
I.e. try pressing ENTER, and then 'k' to exit and zoom into the kernel map, using ESC then zooms out, etc.
Reviewed-by Jiri Olsa <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Jin Yao <[email protected]>
Cc Kan Liang <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/ui/browsers/hists.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
tools/perf/ui/browsers/hists.c +10 -6
@@ -2995,12 +2995,13 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events,while (1 ) {struct thread *thread =NULL ;struct map *map =NULL ; -int choice =0 ; +int choice;int socked_id =-1 ; - nr_options =0 ; - - key =hist_browser__run (browser, helpline, warn_lost_event,0 ); + key =0 ;// reset key +do_hotkey:// key came straight from options ui__popup_menu() + choice = nr_options =0 ; + key =hist_browser__run (browser, helpline, warn_lost_event, key);if (browser->he_selection !=NULL ) { thread =hist_browser__selected_thread (browser);
@@ -3279,10 +3280,13 @@ skip_scripting:do {struct popup_action *act; - choice =ui__popup_menu (nr_options, options,NULL ); -if (choice ==-1 || choice >= nr_options) + choice =ui__popup_menu (nr_options, options, &key); +if (choice ==-1 )break ; +if (choice == nr_options) + goto do_hotkey; + act = &actions[choice]; key = act->fn (browser, act); }while (key ==1 );