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
>
