mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Feng Tang <feng.tang@intel.com>,
	Andi Kleen <andi@firstfloor.org>, Ingo Molnar <mingo@elte.hu>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 02/32] perf browser: Don't show scripts menu for 'perf top'
Date: Mon,  5 Nov 2012 14:17:43 -0300	[thread overview]
Message-ID: <1352135893-7564-3-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1352135893-7564-1-git-send-email-acme@infradead.org>

From: Feng Tang <feng.tang@intel.com>

As 'perf top' has no data files to run scripts against. Also add a
is_report_browser() helper function to judge whether the running browser
is for 'perf report'.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1351699257-5102-1-git-send-email-feng.tang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/hists.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index fe62284..082078a 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1127,6 +1127,12 @@ static inline void free_popup_options(char **options, int n)
 	}
 }
 
+/* Check whether the browser is for 'top' or 'report' */
+static inline bool is_report_browser(void *timer)
+{
+	return timer == NULL;
+}
+
 static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
 				    const char *helpline, const char *ev_name,
 				    bool left_exits,
@@ -1214,7 +1220,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
 			}
 			continue;
 		case 'r':
-			goto do_scripts;
+			if (is_report_browser(timer))
+				goto do_scripts;
+			continue;
 		case K_F1:
 		case 'h':
 		case '?':
@@ -1233,7 +1241,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
 					"E             Expand all callchains\n"
 					"d             Zoom into current DSO\n"
 					"t             Zoom into current Thread\n"
-					"r             Run available scripts\n"
+					"r             Run available scripts('perf report' only)\n"
 					"P             Print histograms to perf.hist.N\n"
 					"V             Verbose (DSO names in callchains, etc)\n"
 					"/             Filter symbol by name");
-- 
1.7.9.2.358.g22243


  parent reply	other threads:[~2012-11-05 17:27 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-05 17:17 [GIT PULL 00/32] perf/core improvements and fixes Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 01/32] perf tools: Remove BINDIR define from exec_cmd.o compilation Arnaldo Carvalho de Melo
2012-11-05 17:17 ` Arnaldo Carvalho de Melo [this message]
2012-11-05 17:17 ` [PATCH 03/32] perf tests: Move test objects into 'tests' directory Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 04/32] perf tests: Add framework for automated perf_event_attr tests Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 05/32] perf tests: Add attr record basic test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 06/32] perf tests: Add attr tests under builtin test command Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 07/32] perf tests: Add attr record group test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 08/32] perf tests: Add attr record event syntax " Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 09/32] perf tests: Add attr record freq test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 10/32] perf tests: Add attr record count test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 11/32] perf tests: Add attr record graph test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 12/32] perf tests: Add attr record period test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 13/32] perf tests: Add attr record no samples test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 14/32] perf tests: Add attr record no-inherit test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 15/32] perf tests: Add attr record data test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 16/32] perf tests: Add attr record raw test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 17/32] perf tests: Add attr record no delay test Arnaldo Carvalho de Melo
2012-11-05 17:17 ` [PATCH 18/32] perf tests: Add attr record branch any test Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 19/32] perf tests: Add attr record branch filter tests Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 20/32] perf tests: Add attr stat no-inherit test Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 21/32] perf tests: Add attr stat group test Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 22/32] perf tests: Add attr stat event syntax " Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 23/32] perf tests: Add attr stat default test Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 24/32] " Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 25/32] perf tests: Add documentation for attr tests Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 26/32] perf tools: Use normalized arch name for searching objdump path Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 27/32] perf tools: Introduce struct hist_browser_timer Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 28/32] perf report: Postpone objdump check until annotation requested Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 29/32] perf tests: Add missing attr stat basic test Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 30/32] perf tests: Factor attr tests WRITE_ASS macro Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 31/32] perf tests: Fix attr watermark field name typo Arnaldo Carvalho de Melo
2012-11-05 17:18 ` [PATCH 32/32] perf tests: Removing 'optional' field Arnaldo Carvalho de Melo
2012-11-13 18:18 ` [GIT PULL 00/32] perf/core improvements and fixes Ingo Molnar

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=1352135893-7564-3-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=andi@firstfloor.org \
    --cc=feng.tang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=namhyung@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

all inboxes | Powered by JetHome®