[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-79e372825f775fabd2219c9c45fbdff93c24cd3f@git.kernel.org>
Date: Fri, 7 Aug 2009 11:12:37 GMT
From: tip-bot for Peter Zijlstra <peterz@...radead.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
a.p.zijlstra@...llo.nl, peterz@...radead.org, rostedt@...dmis.org,
chris.mason@...cle.com, tglx@...utronix.de, jbaron@...hat.com,
mingo@...e.hu
Subject: [tip:perfcounters/urgent] perf: Don't list tracepoints without an id
Commit-ID: 79e372825f775fabd2219c9c45fbdff93c24cd3f
Gitweb: http://git.kernel.org/tip/79e372825f775fabd2219c9c45fbdff93c24cd3f
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Thu, 6 Aug 2009 16:48:54 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Fri, 7 Aug 2009 13:09:10 +0200
perf: Don't list tracepoints without an id
Stop perf list from displaying tracepoints without an id file,
those are special tracepoints that are not interfaced to
perfcounters.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Acked-by: Jason Baron <jbaron@...hat.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Chris Mason <chris.mason@...cle.com>
LKML-Reference: <1249570134.32113.483.camel@...ns>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
tools/perf/util/parse-events.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f77407b..4858d83 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -121,13 +121,29 @@ static unsigned long hw_cache_stat[C(MAX)] = {
(strcmp(sys_dirent.d_name, ".")) && \
(strcmp(sys_dirent.d_name, "..")))
+static int tp_event_has_id(struct dirent *sys_dir, struct dirent *evt_dir)
+{
+ char evt_path[MAXPATHLEN];
+ int fd;
+
+ snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path,
+ sys_dir->d_name, evt_dir->d_name);
+ fd = open(evt_path, O_RDONLY);
+ if (fd < 0)
+ return -EINVAL;
+ close(fd);
+
+ return 0;
+}
+
#define for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next, file, st) \
while (!readdir_r(evt_dir, &evt_dirent, &evt_next) && evt_next) \
if (snprintf(file, MAXPATHLEN, "%s/%s/%s", debugfs_path, \
sys_dirent.d_name, evt_dirent.d_name) && \
(!stat(file, &st)) && (S_ISDIR(st.st_mode)) && \
(strcmp(evt_dirent.d_name, ".")) && \
- (strcmp(evt_dirent.d_name, "..")))
+ (strcmp(evt_dirent.d_name, "..")) && \
+ (!tp_event_has_id(&sys_dirent, &evt_dirent)))
#define MAX_EVENT_LENGTH 30
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists