From: Jiri Olsa <jolsa@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Jean Pihet <jean.pihet@linaro.org>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 08/14] perf tools: Allow to close dso fd in case of open failure
Date: Thu, 15 May 2014 19:23:29 +0200 [thread overview]
Message-ID: <1400174615-2121-9-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1400174615-2121-1-git-send-email-jolsa@kernel.org>
Adding do_open function that tries to close opened
dso objects in case we fail to open the dso due to
to crossing the allowed RLIMIT_NOFILE limit.
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/dso.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index ad0e2da..7404f67 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -159,6 +159,27 @@ static void dso__list_del(struct dso *dso)
dso__data_open_cnt--;
}
+static void close_first_dso(void);
+
+static int do_open(char *name)
+{
+ int fd;
+
+ do {
+ fd = open(name, O_RDONLY);
+ if (fd >= 0)
+ return fd;
+
+ pr_debug("dso open failed, mmap: %s\n", strerror(errno));
+ if (!dso__data_open_cnt || errno != EMFILE)
+ break;
+
+ close_first_dso();
+ } while (1);
+
+ return -1;
+}
+
static int __open_dso(struct dso *dso, struct machine *machine)
{
int fd;
@@ -177,7 +198,7 @@ static int __open_dso(struct dso *dso, struct machine *machine)
return -EINVAL;
}
- fd = open(name, O_RDONLY);
+ fd = do_open(name);
free(name);
return fd;
}
--
1.8.3.1
next prev parent reply other threads:[~2014-05-15 17:26 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-15 17:23 [PATCHv2 00/14] perf tools: Speedup DWARF unwind Jiri Olsa
2014-05-15 17:23 ` [PATCH 01/14] perf tools: Cache register accesses for unwind processing Jiri Olsa
2014-05-15 17:23 ` [PATCH 02/14] perf tools: Separate dso data related variables Jiri Olsa
2014-05-15 17:23 ` [PATCH 03/14] perf tools: Add data_fd into dso object Jiri Olsa
2014-05-15 17:23 ` [PATCH 04/14] perf tools: Add global list of opened dso objects Jiri Olsa
2014-05-15 17:23 ` [PATCH 05/14] perf tools: Add global count " Jiri Olsa
2014-05-15 17:23 ` [PATCH 06/14] perf tools: Cache dso data file descriptor Jiri Olsa
2014-05-27 1:05 ` Namhyung Kim
2014-05-27 7:37 ` Jiri Olsa
2014-05-29 0:02 ` Namhyung Kim
2014-05-29 9:01 ` Jiri Olsa
2014-05-15 17:23 ` [PATCH 07/14] perf tools: Add file size check and factor dso__data_read_offset Jiri Olsa
2014-05-15 17:23 ` Jiri Olsa [this message]
2014-05-15 17:23 ` [PATCH 09/14] perf tools: Add dso__data_* interface descriptons Jiri Olsa
2014-05-27 1:06 ` Namhyung Kim
2014-05-27 7:38 ` Jiri Olsa
2014-05-15 17:23 ` [PATCH 10/14] perf tests: Spawn child for each test Jiri Olsa
2014-05-27 1:08 ` Namhyung Kim
2014-05-27 7:39 ` Jiri Olsa
2014-05-15 17:23 ` [PATCH 11/14] perf tests: Allow reuse of test_file function Jiri Olsa
2014-05-15 17:23 ` [PATCH 12/14] perf tests: Add test interface for dso data fd limit Jiri Olsa
2014-05-27 1:10 ` Namhyung Kim
2014-05-27 7:51 ` Jiri Olsa
2014-05-15 17:23 ` [PATCH 13/14] perf tests: Add test for caching dso file descriptors Jiri Olsa
2014-05-27 1:36 ` Namhyung Kim
2014-05-27 7:54 ` Jiri Olsa
2014-05-29 0:06 ` Namhyung Kim
2014-05-29 8:37 ` Jiri Olsa
2014-05-30 2:11 ` Namhyung Kim
2014-05-30 8:42 ` Jiri Olsa
2014-05-15 17:23 ` [PATCH 14/14] perf tests: Add test for closing dso objects on EMFILE error Jiri Olsa
2014-05-27 1:43 ` Namhyung Kim
2014-05-27 7:59 ` Jiri Olsa
2014-05-23 8:13 ` [PATCHv2 00/14] perf tools: Speedup DWARF unwind Jiri Olsa
2014-05-23 13:26 ` Jean Pihet
2014-05-26 17:36 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400174615-2121-9-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jean.pihet@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).