From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932339AbcELK1K (ORCPT ); Thu, 12 May 2016 06:27:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37942 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbcELK1G (ORCPT ); Thu, 12 May 2016 06:27:06 -0400 Date: Thu, 12 May 2016 03:26:23 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: linux-kernel@vger.kernel.org, brendan.d.gregg@gmail.com, ananth@linux.vnet.ibm.com, peterz@infradead.org, acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, hemant@linux.vnet.ibm.com, masami.hiramatsu.pt@hitachi.com, mhiramat@kernel.org Reply-To: hpa@zytor.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com, hemant@linux.vnet.ibm.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org, brendan.d.gregg@gmail.com, ananth@linux.vnet.ibm.com, peterz@infradead.org, acme@redhat.com, tglx@linutronix.de, namhyung@kernel.org In-Reply-To: <20160511135217.23943.94596.stgit@devbox> References: <20160511135217.23943.94596.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf buildid-cache: Use lsdir() for looking up buildid caches Git-Commit-ID: d65444d2fba98dcd4fa028ffada39c36a46f0038 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d65444d2fba98dcd4fa028ffada39c36a46f0038 Gitweb: http://git.kernel.org/tip/d65444d2fba98dcd4fa028ffada39c36a46f0038 Author: Masami Hiramatsu AuthorDate: Wed, 11 May 2016 22:52:17 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 11 May 2016 13:06:08 -0300 perf buildid-cache: Use lsdir() for looking up buildid caches Use new lsdir() for looking up buildid caches. This changes logic a bit to ignore all dot files, since the build-id cache must not start with dot. Signed-off-by: Masami Hiramatsu Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: Brendan Gregg Cc: Hemant Kumar Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20160511135217.23943.94596.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/build-id.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index b6ecf87..bff425e 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -365,39 +365,17 @@ static char *build_id_cache__dirname_from_path(const char *name, int build_id_cache__list_build_ids(const char *pathname, struct strlist **result) { - struct strlist *list; char *dir_name; - DIR *dir; - struct dirent *d; int ret = 0; - list = strlist__new(NULL, NULL); dir_name = build_id_cache__dirname_from_path(pathname, false, false); - if (!list || !dir_name) { - ret = -ENOMEM; - goto out; - } + if (!dir_name) + return -ENOMEM; - /* List up all dirents */ - dir = opendir(dir_name); - if (!dir) { + *result = lsdir(dir_name, lsdir_no_dot_filter); + if (!*result) ret = -errno; - goto out; - } - - while ((d = readdir(dir)) != NULL) { - if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) - continue; - strlist__add(list, d->d_name); - } - closedir(dir); - -out: free(dir_name); - if (ret) - strlist__delete(list); - else - *result = list; return ret; }