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 13/13] perf tests: Add test for closing dso objects on EMFILE error
Date: Mon, 2 Jun 2014 23:18:47 +0200 [thread overview]
Message-ID: <1401743927-398-14-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1401743927-398-1-git-send-email-jolsa@kernel.org>
Testing that perf properly closes opened dso objects
and tries to reopen in case we run out of allowed file
descriptors for dso data.
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/tests/builtin-test.c | 4 +++
tools/perf/tests/dso-data.c | 73 +++++++++++++++++++++++++++++++++++++++++
tools/perf/tests/tests.h | 1 +
3 files changed, 78 insertions(+)
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index b8a6358..6f8b01b 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -60,6 +60,10 @@ static struct test {
.func = test__dso_data_cache,
},
{
+ .desc = "Test dso data reopen",
+ .func = test__dso_data_reopen,
+ },
+ {
.desc = "roundtrip evsel->name check",
.func = test__perf_evsel__roundtrip_name_test,
},
diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c
index 4df4cbe..e34ed68 100644
--- a/tools/perf/tests/dso-data.c
+++ b/tools/perf/tests/dso-data.c
@@ -283,3 +283,76 @@ int test__dso_data_cache(void)
TEST_ASSERT_VAL("failed leadking files", nr == nr_end);
return 0;
}
+
+int test__dso_data_reopen(void)
+{
+ struct machine machine;
+ long nr_end, nr = open_files_cnt();
+ int fd, fd_extra;
+
+#define dso_0 (dsos[0])
+#define dso_1 (dsos[1])
+#define dso_2 (dsos[2])
+
+ memset(&machine, 0, sizeof(machine));
+
+ /*
+ * Test scenario:
+ * - create 3 dso objects
+ * - set process file descriptor limit to current
+ * files count + 3
+ * - test that the first dso gets closed when we
+ * reach the files count limit
+ */
+
+ /* Make sure we are able to open 3 fds anyway */
+ TEST_ASSERT_VAL("failed to set file limit",
+ !set_fd_limit((nr + 3)));
+
+ TEST_ASSERT_VAL("failed to create dsos\n", !dsos__create(3, TEST_FILE_SIZE));
+
+ /* open dso_0 */
+ fd = dso__data_fd(dso_0, &machine);
+ TEST_ASSERT_VAL("failed to get fd", fd > 0);
+
+ /* open dso_1 */
+ fd = dso__data_fd(dso_1, &machine);
+ TEST_ASSERT_VAL("failed to get fd", fd > 0);
+
+ /*
+ * open extra file descriptor and we just
+ * reached the files count limit
+ */
+ fd_extra = open("/dev/null", O_RDONLY);
+ TEST_ASSERT_VAL("failed to open extra fd", fd_extra > 0);
+
+ /* open dso_2 */
+ fd = dso__data_fd(dso_2, &machine);
+ TEST_ASSERT_VAL("failed to get fd", fd > 0);
+
+ /*
+ * dso_0 should get closed, because we reached
+ * the file descriptor limit
+ */
+ TEST_ASSERT_VAL("failed to close dso_0", dso_0->data.fd == -1);
+
+ /* open dso_0 */
+ fd = dso__data_fd(dso_0, &machine);
+ TEST_ASSERT_VAL("failed to get fd", fd > 0);
+
+ /*
+ * dso_1 should get closed, because we reached
+ * the file descriptor limit
+ */
+ TEST_ASSERT_VAL("failed to close dso_1", dso_1->data.fd == -1);
+
+ /* cleanup everything */
+ close(fd_extra);
+ dsos__delete(3);
+
+ /* Make sure we did not leak any file descriptor. */
+ nr_end = open_files_cnt();
+ pr_debug("nr start %ld, nr stop %ld\n", nr, nr_end);
+ TEST_ASSERT_VAL("failed leadking files", nr == nr_end);
+ return 0;
+}
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index ccc4deb..ed64790 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -29,6 +29,7 @@ int test__pmu(void);
int test__attr(void);
int test__dso_data(void);
int test__dso_data_cache(void);
+int test__dso_data_reopen(void);
int test__parse_events(void);
int test__hists_link(void);
int test__python_use(void);
--
1.8.3.1
next prev parent reply other threads:[~2014-06-02 21:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 21:18 [PATCHv3 00/13] perf tools: Speedup DWARF unwind Jiri Olsa
2014-06-02 21:18 ` [PATCH 01/13] perf tools: Cache register accesses for unwind processing Jiri Olsa
2014-06-02 21:18 ` [PATCH 02/13] perf tools: Separate dso data related variables Jiri Olsa
2014-06-02 21:18 ` [PATCH 03/13] perf tools: Add data_fd into dso object Jiri Olsa
2014-06-02 21:18 ` [PATCH 04/13] perf tools: Add global list of opened dso objects Jiri Olsa
2014-06-02 21:18 ` [PATCH 05/13] perf tools: Add global count " Jiri Olsa
2014-06-02 21:18 ` [PATCH 06/13] perf tools: Cache dso data file descriptor Jiri Olsa
2014-06-03 13:36 ` David Ahern
2014-06-03 13:41 ` Jiri Olsa
2014-06-03 13:39 ` David Ahern
2014-06-03 13:44 ` Jiri Olsa
2014-06-02 21:18 ` [PATCH 07/13] perf tools: Add file size check and factor dso__data_read_offset Jiri Olsa
2014-06-02 21:18 ` [PATCH 08/13] perf tools: Allow to close dso fd in case of open failure Jiri Olsa
2014-06-02 21:18 ` [PATCH 09/13] perf tools: Add dso__data_* interface descriptons Jiri Olsa
2014-06-03 13:45 ` David Ahern
2014-06-03 15:32 ` Jiri Olsa
2014-06-02 21:18 ` [PATCH 10/13] perf tests: Spawn child for each test Jiri Olsa
2014-06-03 13:48 ` David Ahern
2014-06-02 21:18 ` [PATCH 11/13] perf tests: Allow reuse of test_file function Jiri Olsa
2014-06-03 13:51 ` David Ahern
2014-06-03 15:35 ` Jiri Olsa
2014-06-03 18:41 ` David Ahern
2014-06-02 21:18 ` [PATCH 12/13] perf tests: Add test for caching dso file descriptors Jiri Olsa
2014-06-03 13:56 ` David Ahern
2014-06-02 21:18 ` Jiri Olsa [this message]
2014-06-03 13:58 ` [PATCH 13/13] perf tests: Add test for closing dso objects on EMFILE error David Ahern
2014-06-04 14:36 [PATCHv4 00/13] perf tools: Speedup DWARF unwind Jiri Olsa
2014-06-04 14:37 ` [PATCH 13/13] perf tests: Add test for closing dso objects on EMFILE error 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=1401743927-398-14-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).