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, Andi Kleen <ak@linux.intel.com>,
	Jiri Olsa <jolsa@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 01/14] perf tools: Move parse_events error printing to parse_events_options
Date: Mon, 29 Oct 2012 13:09:00 -0200	[thread overview]
Message-ID: <1351523353-27982-2-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1351523353-27982-1-git-send-email-acme@infradead.org>

From: Andi Kleen <ak@linux.intel.com>

The callers of parse_events usually have their own error handling.  Move
the fprintf for a bad event to parse_events_options, which is the only
one who should need it.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1351283415-13170-25-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/parse-events.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3a3efcf..c0b785b 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -827,8 +827,6 @@ int parse_events(struct perf_evlist *evlist, const char *str,
 	 * Both call perf_evlist__delete in case of error, so we dont
 	 * need to bother.
 	 */
-	fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
-	fprintf(stderr, "Run 'perf list' for a list of valid events\n");
 	return ret;
 }
 
@@ -836,7 +834,13 @@ int parse_events_option(const struct option *opt, const char *str,
 			int unset __maybe_unused)
 {
 	struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
-	return parse_events(evlist, str, unset);
+	int ret = parse_events(evlist, str, unset);
+
+	if (ret) {
+		fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
+		fprintf(stderr, "Run 'perf list' for a list of valid events\n");
+	}
+	return ret;
 }
 
 int parse_filter(const struct option *opt, const char *str,
-- 
1.7.9.2.358.g22243


  reply	other threads:[~2012-10-29 15:09 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-29 15:08 [GIT PULL 00/14] perf/core improvements, fixes and code move Arnaldo Carvalho de Melo
2012-10-29 15:09 ` Arnaldo Carvalho de Melo [this message]
2012-10-29 15:09 ` [PATCH 02/14] perf tools: Move build_id__sprintf into build-id object Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 03/14] perf tools: Move BUILD_ID_SIZE " Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 04/14] perf tools: Move hex2u64 into util object Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 05/14] perf tools: Move strxfrchar into string object Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 06/14] perf tools: Move dso_* related functions into dso object Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 07/14] perf tools: Add a global variable "const char *input_name" Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 08/14] perf script: Add more filter to find_scripts() Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 09/14] perf scripts browser: Add a browser for perf script Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 10/14] perf annotate browser: Integrate script browser into annotation browser Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 11/14] perf hists browser: Integrate script browser into main hists browser Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 12/14] perf header: Add is_perf_magic() func Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 13/14] perf record: Fix mmap error output condition Arnaldo Carvalho de Melo
2012-10-29 15:09 ` [PATCH 14/14] perf python: Initialize 'page_size' variable Arnaldo Carvalho de Melo
2012-10-30  7:37 ` [GIT PULL 00/14] perf/core improvements, fixes and code move 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=1351523353-27982-2-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=eranian@google.com \
    --cc=jolsa@redhat.com \
    --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

all inboxes | Powered by JetHome®