From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, dsahern@gmail.com, mingo@kernel.org,
namhyung@kernel.org, andi@firstfloor.org,
linux-kernel@vger.kernel.org, wangnan0@huawei.com,
eranian@google.com, hpa@zytor.com, peterz@infradead.org,
tglx@linutronix.de
Subject: [tip:perf/core] perf hists browser: Skip scripting when perf.data file not available
Date: Wed, 3 Feb 2016 02:15:08 -0800 [thread overview]
Message-ID: <tip-b1baae89197e21cd115e9493d5a17f18fca81e6a@git.kernel.org> (raw)
In-Reply-To: <1453555902-18401-4-git-send-email-namhyung@kernel.org>
Commit-ID: b1baae89197e21cd115e9493d5a17f18fca81e6a
Gitweb: http://git.kernel.org/tip/b1baae89197e21cd115e9493d5a17f18fca81e6a
Author: Namhyung Kim <namhyung@kernel.org>
AuthorDate: Tue, 26 Jan 2016 15:37:30 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>,
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1453555902-18401-4-git-send-email-namhyung@kernel.org
[ Use goto skip_scripting instead of two is_report_browser() tests ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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]);
prev parent reply other threads:[~2016-02-03 10:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 13:31 [PATCH 1/4] perf hists browser: Check DSO related context menu Namhyung Kim
2016-01-23 13:31 ` [PATCH 2/4] perf hists browser: Check socket " Namhyung Kim
2016-01-23 13:31 ` [PATCH 3/4] perf hists browser: Relax context menu check for symbol sort key Namhyung Kim
2016-01-23 13:31 ` [PATCH 4/4] perf hists browser: Check script context menu Namhyung Kim
2016-01-26 18:35 ` Arnaldo Carvalho de Melo
2016-01-26 18:36 ` Arnaldo Carvalho de Melo
2016-01-27 13:12 ` Namhyung Kim
2016-02-03 10:15 ` tip-bot for Namhyung Kim [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b1baae89197e21cd115e9493d5a17f18fca81e6a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome