Re: [PATCH 3/5] perf tools: Copy metric events properly when expand cgroups

Jiri Olsa
2020-09-22T21:29:43Z

On Mon, Sep 21, 2020 at 06:46:08PM +0900, Namhyung Kim wrote:

SNIP

> @@ -260,6 +267,11 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str)
> cgroup__put(cgrp);
> nr_cgroups++;
>
> + perf_stat__collect_metric_expr(tmp_list);
> + if (metricgroup__copy_metric_events(tmp_list, cgrp, metric_events,
> + &orig_metric_events) < 0)
> + break;
> +
> perf_evlist__splice_list_tail(evlist, &tmp_list->core.entries);
> tmp_list->core.nr_entries = 0;
>
> @@ -273,6 +285,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str)
> out_err:
> evlist__delete(orig_list);
> evlist__delete(tmp_list);
> + rblist__exit(&orig_metric_events);
>
> return ret;
> }
> diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h
> index 32893018296f..eea6df8ee373 100644
> --- a/tools/perf/util/cgroup.h
> +++ b/tools/perf/util/cgroup.h
> @@ -22,9 +22,11 @@ struct cgroup *cgroup__get(struct cgroup *cgroup);
> void cgroup__put(struct cgroup *cgroup);
>
> struct evlist;
> +struct rblist;
>
> struct cgroup *evlist__findnew_cgroup(struct evlist *evlist, const char *name);
> -int evlist__expand_cgroup(struct evlist *evlist, const char *cgroups);
> +int evlist__expand_cgroup(struct evlist *evlist, const char *cgroups,
> + struct rblist *metric_events);
>
> void evlist__set_default_cgroup(struct evlist *evlist, struct cgroup *cgroup);
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index ee7b576d3b12..424209c4bcd2 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -1964,3 +1964,14 @@ int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd)
>
> return err;
> }
> +
> +struct evsel *evlist__get_evsel(struct evlist *evlist, int idx)

perhaps evlist__find_evsel is better name?
we have get/put names for functions changing refcount

jirka

> +{
> + struct evsel *evsel;
> +
> + evlist__for_each_entry(evlist, evsel) {
> + if (evsel->idx == idx)
> + return evsel;
> + }
> + return NULL;
> +}

SNIP