mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@gmail.com>
To: Jiri Olsa <jolsa@kernel.org>
Cc: linux-kernel@vger.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>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH 13/14] perf tests: Add test for caching dso file descriptors
Date: Tue, 27 May 2014 10:36:44 +0900	[thread overview]
Message-ID: <87d2f0huj7.fsf@sejong.aot.lge.com> (raw)
In-Reply-To: <1400174615-2121-14-git-send-email-jolsa@kernel.org> (Jiri Olsa's message of "Thu, 15 May 2014 19:23:34 +0200")

On Thu, 15 May 2014 19:23:34 +0200, Jiri Olsa wrote:
> Adding test that setup test_dso_data__fd_limit and test
> dso data file descriptors are cached appropriately.

[SNIP]
> +static long open_files_cnt(void)
> +{
> +	char path[PATH_MAX];
> +	struct dirent *dent;
> +	DIR *dir;
> +	long nr = 0;
> +	int n;
> +
> +	n = scnprintf(path, PATH_MAX, "%s/self/fd", procfs__mountpoint());
> +	TEST_ASSERT_VAL("couldn't get fd path", n < PATH_MAX);

Looks like an unnecessary check since the scnprintf() cannot return more
than (or equal to) PATH_MAX.

> +
> +	pr_debug("fd path: %s\n", path);
> +
> +	dir = opendir(path);
> +	TEST_ASSERT_VAL("failed to open fd directory", dir);
> +
> +	while ((dent = readdir(dir)) != NULL) {
> +		if (!strcmp(dent->d_name, ".") ||
> +		    !strcmp(dent->d_name, ".."))
> +			continue;
> +
> +		nr++;
> +	}
> +
> +	closedir(dir);
> +	return nr - 1;
> +}

[SNIP]
> +static int set_fd_limit(int n)
> +{
> +	struct rlimit rlim;
> +
> +	if (getrlimit(RLIMIT_NOFILE, &rlim))
> +		return -1;
> +
> +	pr_debug("file limit %ld, new %d\n", (long) rlim.rlim_cur, n);
> +
> +	rlim.rlim_cur = n;
> +	return setrlimit(RLIMIT_NOFILE, &rlim);
> +}
> +
> +int test__dso_data_cache(void)
> +{
> +	struct machine machine;
> +	long nr = open_files_cnt();
> +#define BUFSIZE 10
> +	u8 buf[BUFSIZE];
> +	ssize_t n;
> +	int fd;
> +
> +	memset(&machine, 0, sizeof(machine));
> +
> +	/* Make sure we are able to open 3 fds anyway */
> +	TEST_ASSERT_VAL("failed to set file limit",
> +			!set_fd_limit((nr + 6)));

3 or 6?

> +
> +	/*
> +	 * Test scenario:
> +	 * - create 3 dso objects
> +	 * - set the limit of opened data file descriptors to 2
> +	 * - open/close dsos data fds and check for proper
> +	 *   handling of the dso data cache
> +	 */
> +
> +	test_dso_data__fd_limit = 3;

2 or 3?

> +
> +	TEST_ASSERT_VAL("failed to create dsos\n", !dsos__create(TEST_FILE_SIZE));
> +
> +	/* open dso_0 */
> +	fd = dso__data_fd(dso_0, &machine);
> +	TEST_ASSERT_VAL("failed to get fd", fd > 0);
> +
> +	n = dso__data_read_offset(dso_0, &machine, 0, buf, BUFSIZE);
> +	TEST_ASSERT_VAL("failed to read dso", n == BUFSIZE);
> +
> +	/*
> +	 * Close dso_0 data with cache = true,

What does it mean by 'cache = true'?


> +	 * dso_0 should remain open.
> +	 */
> +	dso__data_close(dso_0);
> +	TEST_ASSERT_VAL("failed to not close dso", dso_0->data.fd != -1);
> +
> +	/* open dso_1 */
> +	n = dso__data_read_offset(dso_1, &machine, 0, buf, BUFSIZE);
> +	TEST_ASSERT_VAL("failed to read dso", n == BUFSIZE);
> +
> +	/*
> +	 * Close dso_1 data with cache = true,
> +	 * dso_0 and dso_1 should remain open.
> +	 */
> +	dso__data_close(dso_1);
> +	TEST_ASSERT_VAL("failed to not close dso", dso_0->data.fd != -1);
> +	TEST_ASSERT_VAL("failed to not close dso", dso_1->data.fd != -1);
> +
> +	/* open dso_2 */
> +	fd = dso__data_fd(dso_2, &machine);
> +	TEST_ASSERT_VAL("failed to get fd", fd > 0);
> +
> +	/*
> +	 * Close dso_1 data with cache = true,

You meant dso_2 right? :)

Thanks,
Namhyung


> +	 * dso_0 should get closed now
> +	 */
> +	dso__data_close(dso_2);
> +	TEST_ASSERT_VAL("failed to close dso_0", dso_0->data.fd == -1);
> +
> +	/* reopen dso_0 */
> +	fd = dso__data_fd(dso_0, &machine);
> +	TEST_ASSERT_VAL("failed to get fd", fd > 0);
> +
> +	/*
> +	 * Close dso_0 data with cache = true,
> +	 * dso_1 should get closed now.
> +	 */
> +	dso__data_close(dso_0);
> +	TEST_ASSERT_VAL("failed to close dso_1", dso_1->data.fd == -1);
> +
> +	/* reopen dso_1 */
> +	n = dso__data_read_offset(dso_1, &machine, 0, buf, BUFSIZE);
> +	TEST_ASSERT_VAL("failed to read dso", n == BUFSIZE);
> +
> +	/*
> +	 * Close dso_1 data with cache = true,
> +	 * dso_2 should get closed now.
> +	 */
> +	dso__data_close(dso_1);
> +	TEST_ASSERT_VAL("failed to close dso_2", dso_2->data.fd == -1);
> +
> +	/* dso_0 remains open */
> +	TEST_ASSERT_VAL("failed to keep open dso_0", dso_0->data.fd >= 0);
> +
> +	/* cleanup everything */
> +	dsos__delete();
> +
> +	pr_debug("nr start %ld, nr stop %ld\n", nr, open_files_cnt());
> +
> +	/* Make sure we did not leak any file descriptor. */
> +	TEST_ASSERT_VAL("failed leadking files", nr == open_files_cnt());
> +	return 0;
> +}
> diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
> index a9d7cb0..61e12b6 100644
> --- a/tools/perf/tests/tests.h
> +++ b/tools/perf/tests/tests.h
> @@ -28,6 +28,7 @@ int test__syscall_open_tp_fields(void);
>  int test__pmu(void);
>  int test__attr(void);
>  int test__dso_data(void);
> +int test__dso_data_cache(void);
>  int test__parse_events(void);
>  int test__hists_link(void);
>  int test__python_use(void);

  reply	other threads:[~2014-05-27  1:36 UTC|newest]

Thread overview: 37+ 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 ` [PATCH 08/14] perf tools: Allow to close dso fd in case of open failure Jiri Olsa
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 [this message]
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
2014-06-12 15:30 [GIT PULL 00/14] perf/core improvements and fixes Jiri Olsa
2014-06-12 15:30 ` [PATCH 13/14] perf tests: Add test for caching dso file descriptors 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=87d2f0huj7.fsf@sejong.aot.lge.com \
    --to=namhyung@gmail.com \
    --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=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@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

Powered by JetHome