From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754036AbZHFOtT (ORCPT ); Thu, 6 Aug 2009 10:49:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753826AbZHFOtT (ORCPT ); Thu, 6 Aug 2009 10:49:19 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:53931 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753756AbZHFOtS (ORCPT ); Thu, 6 Aug 2009 10:49:18 -0400 Subject: [PATCH -v2] perf: Don't list tracepoints without an id From: Peter Zijlstra To: Jason Baron Cc: Ingo Molnar , Steven Rostedt , Chris Mason , lkml In-Reply-To: <20090805200721.GA3127@redhat.com> References: <1249497664.5890.4.camel@laptop> <1249500229.5890.10.camel@laptop> <20090805200721.GA3127@redhat.com> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Thu, 06 Aug 2009 16:48:54 +0200 Message-Id: <1249570134.32113.483.camel@twins> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stop perf list from displaying tracepoints without an id file. Signed-off-by: Peter Zijlstra --- 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