From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185Ab0FXGR4 (ORCPT ); Thu, 24 Jun 2010 02:17:56 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:52474 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751273Ab0FXGRz (ORCPT ); Thu, 24 Jun 2010 02:17:55 -0400 Message-ID: <4C22F82F.10106@cn.fujitsu.com> Date: Thu, 24 Jun 2010 14:16:15 +0800 From: Gui Jianfeng User-Agent: Thunderbird 2.0.0.24 (Windows/20100228) MIME-Version: 1.0 To: acme@ghostprotocols.net CC: mingo@elte.hu, Yanmin Zhang , linux kernel mailing list , a.p.zijlstra@chello.nl, paulus@samba.org Subject: Re: [PATCH] perf: close the opened directories. References: <4C1C3F7C.4030607@cn.fujitsu.com> In-Reply-To: <4C1C3F7C.4030607@cn.fujitsu.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Gui Jianfeng wrote: > When I ran "perf kvm ... top", I encountered the following error output. > > Error: perfcounter syscall returned with -1 (Too many open files) > > Fatal: No CONFIG_PERF_EVENTS=y kernel support configured? > > Looking into perf, I found perf opens too many direcotries at initialization > time, but forgets to close them. Here is the fix. Ping. > > Signed-off-by: Gui Jianfeng > --- > tools/perf/util/symbol.c | 18 +++++++++++------- > 1 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c > index 7fd6b15..a00dcad 100644 > --- a/tools/perf/util/symbol.c > +++ b/tools/perf/util/symbol.c > @@ -1443,6 +1443,7 @@ static int map_groups__set_modules_path_dir(struct map_groups *self, > { > struct dirent *dent; > DIR *dir = opendir(dir_name); > + int ret = 0; > > if (!dir) { > pr_debug("%s: cannot open %s dir\n", __func__, dir_name); > @@ -1465,8 +1466,10 @@ static int map_groups__set_modules_path_dir(struct map_groups *self, > > snprintf(path, sizeof(path), "%s/%s", > dir_name, dent->d_name); > - if (map_groups__set_modules_path_dir(self, path) < 0) > - goto failure; > + if (map_groups__set_modules_path_dir(self, path) < 0) { > + ret = -1; > + goto out; > + } > } else { > char *dot = strrchr(dent->d_name, '.'), > dso_name[PATH_MAX]; > @@ -1487,17 +1490,18 @@ static int map_groups__set_modules_path_dir(struct map_groups *self, > dir_name, dent->d_name); > > long_name = strdup(path); > - if (long_name == NULL) > - goto failure; > + if (long_name == NULL) { > + ret = -1; > + goto out; > + } > dso__set_long_name(map->dso, long_name); > dso__kernel_module_get_build_id(map->dso, ""); > } > } > > - return 0; > -failure: > +out: > closedir(dir); > - return -1; > + return ret; > } > > static char *get_kernel_version(const char *root_dir)