Messages in this thread | | | Date | Thu, 6 Aug 2009 15:33:49 -0400 | From | Jason Baron <> | Subject | Re: [PATCH -v2] perf: Don't list tracepoints without an id |
| |
On Thu, Aug 06, 2009 at 04:48:54PM +0200, Peter Zijlstra wrote: > Stop perf list from displaying tracepoints without an id file. > > Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> > --- > tools/perf/util/parse-events.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > Index: linux-2.6/tools/perf/util/parse-events.c > =================================================================== > --- linux-2.6.orig/tools/perf/util/parse-events.c > +++ linux-2.6/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 >
looks good to me.
Acked-by: Jason Baron <jbaron@redhat.com>
thanks,
-Jason
| |