From: Jiri Olsa <jolsa@redhat.com>
To: acme@redhat.com, a.p.zijlstra@chello.nl, mingo@elte.hu,
paulus@samba.org, cjashfor@linux.vnet.ibm.com,
fweisbec@gmail.com, eranian@google.com
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@redhat.com>
Subject: [PATCH 3/6] perf, tool: Fix pmu object alias initialization
Date: Mon, 9 Jul 2012 22:37:47 +0200 [thread overview]
Message-ID: <1341866270-4915-4-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1341866270-4915-1-git-send-email-jolsa@redhat.com>
The pmu_lookup should return pmus that do not expose the 'events'
group attribute in sysfs. Also it should fail when any other error
during 'events' lookup is hit (pmu_aliases fails).
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/util/pmu.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 67715a4..3c86022 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -161,7 +161,7 @@ static int pmu_aliases(char *name, struct list_head *head)
"%s/bus/event_source/devices/%s/events", sysfs, name);
if (stat(path, &st) < 0)
- return -1;
+ return 0; /* no error if 'events' does not exist */
if (pmu_aliases_parse(path, head))
return -1;
@@ -237,6 +237,9 @@ static struct perf_pmu *pmu_lookup(char *name)
if (pmu_format(name, &format))
return NULL;
+ if (pmu_aliases(name, &aliases))
+ return NULL;
+
if (pmu_type(name, &type))
return NULL;
@@ -244,8 +247,6 @@ static struct perf_pmu *pmu_lookup(char *name)
if (!pmu)
return NULL;
- pmu_aliases(name, &aliases);
-
INIT_LIST_HEAD(&pmu->format);
INIT_LIST_HEAD(&pmu->aliases);
list_splice(&format, &pmu->format);
--
1.7.10.4
next prev parent reply other threads:[~2012-07-09 20:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 20:37 [PATCHv3 0/6] perf, tool: Allow to use hw events in PMU syntax Jiri Olsa
2012-07-09 20:37 ` [PATCH 1/6] perf, x86: Making hardware events translations available in sysfs Jiri Olsa
2012-08-20 8:25 ` Stephane Eranian
2012-08-20 9:55 ` Jiri Olsa
2012-07-09 20:37 ` [PATCH 2/6] perf, x86: Filter out undefined events from sysfs events attribute Jiri Olsa
2012-07-09 20:37 ` Jiri Olsa [this message]
2012-07-09 20:37 ` [PATCH 4/6] perf, tool: Properly free format data Jiri Olsa
2012-07-09 20:37 ` [PATCH 5/6] perf, tool: Add support to specify hw event as pmu event term Jiri Olsa
2012-07-09 20:37 ` [PATCH 6/6] perf, test: Add automated tests for pmu sysfs translated events Jiri Olsa
2012-08-08 12:42 ` [PATCHv3 0/6] perf, tool: Allow to use hw events in PMU syntax Jiri Olsa
2012-08-16 13:44 ` Jiri Olsa
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=1341866270-4915-4-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.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).