From: Jiri Olsa <jolsa@redhat.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Stephane Eranian <eranian@google.com>,
LKML <linux-kernel@vger.kernel.org>,
Andi Kleen <ak@linux.intel.com>, Ian Rogers <irogers@google.com>,
John Garry <john.garry@huawei.com>
Subject: Re: [PATCH 4/4] perf test: Add expand cgroup event test
Date: Fri, 18 Sep 2020 15:51:20 +0200 [thread overview]
Message-ID: <20200918135120.GD2626435@krava> (raw)
In-Reply-To: <20200916063129.1061487-5-namhyung@kernel.org>
On Wed, Sep 16, 2020 at 03:31:29PM +0900, Namhyung Kim wrote:
SNIP
> +++ b/tools/perf/tests/tests.h
> @@ -123,6 +123,7 @@ const char *test__pfm_subtest_get_desc(int subtest);
> int test__pfm_subtest_get_nr(void);
> int test__parse_metric(struct test *test, int subtest);
> int test__pe_file_parsing(struct test *test, int subtest);
> +int test__expand_cgroup_events(struct test *test, int subtest);
>
> bool test__bp_signal_is_supported(void);
> bool test__bp_account_is_supported(void);
> diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
> index a1bf345a770b..eeffa08251b5 100644
> --- a/tools/perf/util/cgroup.c
> +++ b/tools/perf/util/cgroup.c
> @@ -52,7 +52,7 @@ static struct cgroup *evlist__find_cgroup(struct evlist *evlist, const char *str
> return NULL;
> }
could you please put the do_open change below into separate patch?
thanks,
jirka
>
> -static struct cgroup *cgroup__new(const char *name)
> +static struct cgroup *cgroup__new(const char *name, bool do_open)
> {
> struct cgroup *cgroup = zalloc(sizeof(*cgroup));
>
> @@ -62,9 +62,14 @@ static struct cgroup *cgroup__new(const char *name)
> cgroup->name = strdup(name);
> if (!cgroup->name)
> goto out_err;
> - cgroup->fd = open_cgroup(name);
> - if (cgroup->fd == -1)
> - goto out_free_name;
> +
> + if (do_open) {
> + cgroup->fd = open_cgroup(name);
> + if (cgroup->fd == -1)
> + goto out_free_name;
> + } else {
> + cgroup->fd = -1;
> + }
> }
>
> return cgroup;
> @@ -80,7 +85,7 @@ struct cgroup *evlist__findnew_cgroup(struct evlist *evlist, const char *name)
> {
> struct cgroup *cgroup = evlist__find_cgroup(evlist, name);
>
> - return cgroup ?: cgroup__new(name);
> + return cgroup ?: cgroup__new(name, true);
> }
>
> static int add_cgroup(struct evlist *evlist, const char *str)
> @@ -202,7 +207,7 @@ int parse_cgroups(const struct option *opt, const char *str,
> }
>
> int evlist__expand_cgroup(struct evlist *evlist, const char *str,
> - struct rblist *metric_events)
> + struct rblist *metric_events, bool open_cgroup)
> {
> struct evlist *orig_list, *tmp_list;
> struct evsel *pos, *evsel, *leader;
> @@ -240,7 +245,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str,
> if (!name)
> break;
>
> - cgrp = cgroup__new(name);
> + cgrp = cgroup__new(name, open_cgroup);
> free(name);
> if (cgrp == NULL)
> break;
> diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h
> index eea6df8ee373..162906f3412a 100644
> --- a/tools/perf/util/cgroup.h
> +++ b/tools/perf/util/cgroup.h
> @@ -26,7 +26,7 @@ struct rblist;
>
> struct cgroup *evlist__findnew_cgroup(struct evlist *evlist, const char *name);
> int evlist__expand_cgroup(struct evlist *evlist, const char *cgroups,
> - struct rblist *metric_events);
> + struct rblist *metric_events, bool open_cgroup);
>
> void evlist__set_default_cgroup(struct evlist *evlist, struct cgroup *cgroup);
>
> --
> 2.28.0.618.gf4bc123cb7-goog
>
next prev parent reply other threads:[~2020-09-18 13:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 6:31 [PATCHSET v2 0/4] perf stat: Expand events for each cgroup Namhyung Kim
2020-09-16 6:31 ` [PATCH 1/4] perf evsel: Add evsel__clone() function Namhyung Kim
2020-09-18 13:31 ` Jiri Olsa
2020-09-21 5:44 ` Namhyung Kim
2020-09-16 6:31 ` [PATCH 2/4] perf stat: Add --for-each-cgroup option Namhyung Kim
2020-09-16 13:51 ` Arnaldo Carvalho de Melo
2020-09-17 1:33 ` Namhyung Kim
2020-09-18 13:34 ` Jiri Olsa
2020-09-21 5:45 ` Namhyung Kim
2020-09-16 6:31 ` [PATCH 3/4] perf tools: Copy metric events properly when expand cgroups Namhyung Kim
2020-09-18 13:45 ` Jiri Olsa
2020-09-21 5:48 ` Namhyung Kim
2020-09-16 6:31 ` [PATCH 4/4] perf test: Add expand cgroup event test Namhyung Kim
2020-09-18 13:51 ` Jiri Olsa [this message]
2020-09-21 5:49 ` Namhyung Kim
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=20200918135120.GD2626435@krava \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=john.garry@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.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