[tip:perf/core] perf hists browser: Skip scripting when perf.data file not available
From: tip-bot for Namhyung Kim
Date: Wed Feb 03 2016 - 05:16:14 EST
Commit-ID: b1baae89197e21cd115e9493d5a17f18fca81e6a
Gitweb: http://git.kernel.org/tip/b1baae89197e21cd115e9493d5a17f18fca81e6a
Author: Namhyung Kim <namhyung@xxxxxxxxxx>
AuthorDate: Tue, 26 Jan 2016 15:37:30 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 26 Jan 2016 16:08:12 -0300
perf hists browser: Skip scripting when perf.data file not available
The script and data-switch context menu are only meaningful when it
deals with a data file. So add a check so that it cannot be shown when
perf-top is run.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Tested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>,
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1453555902-18401-4-git-send-email-namhyung@xxxxxxxxxx
[ Use goto skip_scripting instead of two is_report_browser() tests ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/ui/browsers/hists.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index d07e6be..1da30f8 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2303,6 +2303,9 @@ skip_annotation:
&options[nr_options],
socked_id);
/* perf script support */
+ if (!is_report_browser(hbt))
+ goto skip_scripting;
+
if (browser->he_selection) {
if (sort__has_thread && thread) {
nr_options += add_script_opt(browser,
@@ -2330,6 +2333,7 @@ skip_annotation:
&options[nr_options], NULL, NULL);
nr_options += add_switch_opt(browser, &actions[nr_options],
&options[nr_options]);
+skip_scripting:
nr_options += add_exit_opt(browser, &actions[nr_options],
&options[nr_options]);