Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7727a925 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf ui browsers: Remove help messages about use of right and arrow keys 

They were repurposed for horizontal scrolling, so use just ENTER/ESC in
the help messages.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: c6c3c02d ("perf hists browser: Implement horizontal scrolling")
Link: http://lkml.kernel.org/n/tip-n5ar4qg8fs12ax4vhr3rxhxj@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent dc38218e

tools/perf/ui/browsers/annotate.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -768,8 +768,8 @@ static int annotate_browser__run(struct annotate_browser *browser, 
		"UP/DOWN/PGUP\n"

		"UP/DOWN/PGUP\n"

		"PGDN/SPACE    Navigate\n"

		"PGDN/SPACE    Navigate\n"

		"q/ESC/CTRL+C  Exit\n\n"

		"q/ESC/CTRL+C  Exit\n\n"

		"->            Go to target\n"

		"ENTER         Go to target\n"

		"<-            Exit\n"

		"ESC           Exit\n"

		"H             Cycle thru hottest instructions\n"

		"H             Cycle thru hottest instructions\n"

		"j             Toggle showing jump to target arrows\n"

		"j             Toggle showing jump to target arrows\n"

		"J             Toggle showing number of jump sources on targets\n"

		"J             Toggle showing number of jump sources on targets\n"
@@ -1056,7 +1056,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, 
		goto out_free_offsets;

		goto out_free_offsets;

	}

	}





	ui_helpline__push("Press <- or ESC to exit");

	ui_helpline__push("Press ESC to exit");





	notes = symbol__annotation(sym);

	notes = symbol__annotation(sym);

	browser.start = map__rip_2objdump(map, sym->start);

	browser.start = map__rip_2objdump(map, sym->start);

tools/perf/ui/browsers/hists.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1496,7 +1496,7 @@ do_zoom_thread(struct hist_browser *browser, struct popup_action *act) 
		thread__zput(browser->hists->thread_filter);

		thread__zput(browser->hists->thread_filter);

		ui_helpline__pop();

		ui_helpline__pop();

	} else {

	} else {

		ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"",

		ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s(%d) thread\"",

				   thread->comm_set ? thread__comm_str(thread) : "",

				   thread->comm_set ? thread__comm_str(thread) : "",

				   thread->tid);

				   thread->tid);

		browser->hists->thread_filter = thread__get(thread);

		browser->hists->thread_filter = thread__get(thread);
@@ -1540,7 +1540,7 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act) 
	} else {

	} else {

		if (map == NULL)

		if (map == NULL)

			return 0;

			return 0;

		ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s DSO\"",

		ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s DSO\"",

				   __map__is_kernel(map) ? "the Kernel" : map->dso->short_name);

				   __map__is_kernel(map) ? "the Kernel" : map->dso->short_name);

		browser->hists->dso_filter = map->dso;

		browser->hists->dso_filter = map->dso;

		perf_hpp__set_elide(HISTC_DSO, true);

		perf_hpp__set_elide(HISTC_DSO, true);
@@ -1761,8 +1761,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
	"For multiple event sessions:\n\n"				\

	"For multiple event sessions:\n\n"				\

	"TAB/UNTAB     Switch events\n\n"				\

	"TAB/UNTAB     Switch events\n\n"				\

	"For symbolic views (--sort has sym):\n\n"			\

	"For symbolic views (--sort has sym):\n\n"			\

	"->            Zoom into DSO/Threads & Annotate current symbol\n" \

	"ENTER         Zoom into DSO/Threads & Annotate current symbol\n" \

	"<-            Zoom out\n"					\

	"ESC           Zoom out\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"				\

tools/perf/ui/browsers/map.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ static int map_browser__run(struct map_browser *browser) 
	int key;

	int key;





	if (ui_browser__show(&browser->b, browser->map->dso->long_name,

	if (ui_browser__show(&browser->b, browser->map->dso->long_name,

			     "Press <- or ESC to exit, %s / to search",

			     "Press ESC to exit, %s / to search",

			     verbose ? "" : "restart with -v to use") < 0)

			     verbose ? "" : "restart with -v to use") < 0)

		return -1;

		return -1;

tools/perf/ui/browsers/scripts.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static int script_browser__run(struct perf_script_browser *browser) 
	int key;

	int key;





	if (ui_browser__show(&browser->b, browser->script_name,

	if (ui_browser__show(&browser->b, browser->script_name,

			     "Press <- or ESC to exit") < 0)

			     "Press ESC to exit") < 0)

		return -1;

		return -1;





	while (1) {

	while (1) {