From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>
Subject: [PATCH 4/4] perf hists browser: Check script context menu
Date: Sat, 23 Jan 2016 22:31:42 +0900 [thread overview]
Message-ID: <1453555902-18401-4-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1453555902-18401-1-git-send-email-namhyung@kernel.org>
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>
---
tools/perf/ui/browsers/hists.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 05e94feba3cb..0affffeed89c 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2309,7 +2309,7 @@ skip_annotation:
socked_id);
}
/* perf script support */
- if (browser->he_selection) {
+ if (is_report_browser(hbt) && browser->he_selection) {
if (sort__has_thread) {
nr_options += add_script_opt(browser,
&actions[nr_options],
@@ -2332,10 +2332,12 @@ skip_annotation:
NULL, browser->selection->sym);
}
}
- nr_options += add_script_opt(browser, &actions[nr_options],
- &options[nr_options], NULL, NULL);
- nr_options += add_switch_opt(browser, &actions[nr_options],
- &options[nr_options]);
+ if (is_report_browser(hbt)) {
+ nr_options += add_script_opt(browser, &actions[nr_options],
+ &options[nr_options], NULL, NULL);
+ nr_options += add_switch_opt(browser, &actions[nr_options],
+ &options[nr_options]);
+ }
nr_options += add_exit_opt(browser, &actions[nr_options],
&options[nr_options]);
--
2.6.4
next prev parent reply other threads:[~2016-01-23 13:32 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 ` Namhyung Kim [this message]
2016-01-26 18:35 ` [PATCH 4/4] perf hists browser: Check script context menu 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:perf/core] perf hists browser: Skip scripting when perf.data file not available tip-bot for Namhyung Kim
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=1453555902-18401-4-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).