From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932481AbcEKPuW (ORCPT ); Wed, 11 May 2016 11:50:22 -0400 Received: from mail.kernel.org ([198.145.29.136]:58819 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605AbcEKPuS (ORCPT ); Wed, 11 May 2016 11:50:18 -0400 Date: Wed, 11 May 2016 12:50:14 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: linux-kernel@vger.kernel.org, Namhyung Kim , Peter Zijlstra , Ingo Molnar , Hemant Kumar , Ananth N Mavinakayanahalli , Brendan Gregg Subject: Re: [PATCH perf/core v7 06/21] perf-buildid-cache: Use lsdir for looking up buildid caches Message-ID: <20160511155014.GC20258@kernel.org> References: <20160511135110.23943.38738.stgit@devbox> <20160511135217.23943.94596.stgit@devbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160511135217.23943.94596.stgit@devbox> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, May 11, 2016 at 10:52:17PM +0900, Masami Hiramatsu escreveu: > From: Masami Hiramatsu > > 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. Applied > Signed-off-by: Masami Hiramatsu > Signed-off-by: Masami Hiramatsu > --- > Changes in v7: > - Remove unneeded local strlist. > --- > 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 53df9aa..2cb6454 100644 > --- a/tools/perf/util/build-id.c > +++ b/tools/perf/util/build-id.c > @@ -369,39 +369,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; > }