Re: [PATCH 14/14] perf tests: Add test for closing dso objects on EMFILE error

From: Jiri Olsa
Date: Tue May 27 2014 - 03:59:54 EST


On Tue, May 27, 2014 at 10:43:57AM +0900, Namhyung Kim wrote:
> On Thu, 15 May 2014 19:23:35 +0200, Jiri Olsa wrote:
> > 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@xxxxxxxxxx>
> > Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
> > Cc: David Ahern <dsahern@xxxxxxxxx>
> > Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> > Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> > Cc: Jean Pihet <jean.pihet@xxxxxxxxxx>
> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> > Cc: Paul Mackerras <paulus@xxxxxxxxx>
> > Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> > Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> > ---
> > tools/perf/tests/builtin-test.c | 4 +++
> > tools/perf/tests/dso-data.c | 70 +++++++++++++++++++++++++++++++++++++++++
> > tools/perf/tests/tests.h | 1 +
> > 3 files changed, 75 insertions(+)
> >
> > diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> > index c4d581a..a489cda 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 84ab939..ecc8acd 100644
> > --- a/tools/perf/tests/dso-data.c
> > +++ b/tools/perf/tests/dso-data.c
> > @@ -328,3 +328,73 @@ int test__dso_data_cache(void)
> > TEST_ASSERT_VAL("failed leadking files", nr == open_files_cnt());
> > return 0;
> > }
> > +
> > +int test__dso_data_reopen(void)
> > +{
> > + struct machine machine;
> > + long nr = open_files_cnt();
> > +#define BUFSIZE 10
>
> Looks like a copy-n-paste error.. :)

yea.. ;) I wonder why gcc did not scream about that

SNIP

> > +
> > + /*
> > + * dso_1 should get closed, because we reached
> > + * the file descriptor limit
> > + */
> > + TEST_ASSERT_VAL("failed to close dso_0", dso_1->data.fd == -1);
>
> s/dso_0/dso_1/
>
> Btw, I don't see a big difference between this and previous testcase.
> Any chance to merge them into one?

- the first one tests the caching or closing of file descriptors
after dso__data_close is called

- the second one tests that we actually try to close dso objects
in case we cannot open new dso

thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/