From: Arnaldo Carvalho de Melo <a...@redhat.com> The refcount operation counterpart to cgroup__put(), use it when reusing a cgroup.
Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: David Ahern <dsah...@gmail.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Stephane Eranian <eran...@google.com> Cc: Wang Nan <wangn...@huawei.com> Link: https://lkml.kernel.org/n/tip-14ynvrl7y2cz8gyuy5q5v...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/cgroup.c | 16 ++++++++++------ tools/perf/util/cgroup.h | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index b078d54d4245..8ea964461eb7 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -99,15 +99,12 @@ static int add_cgroup(struct perf_evlist *evlist, char *str) * check if cgrp is already defined, if so we reuse it */ evlist__for_each_entry(evlist, counter) { - cgrp = counter->cgrp; - if (!cgrp) + if (!counter->cgrp) continue; - if (!strcmp(cgrp->name, str)) { - refcount_inc(&cgrp->refcnt); + if (!strcmp(counter->cgrp->name, str)) { + cgrp = cgroup__get(counter->cgrp); break; } - - cgrp = NULL; } if (!cgrp) { @@ -157,6 +154,13 @@ void cgroup__put(struct cgroup *cgrp) } } +struct cgroup *cgroup__get(struct cgroup *cgroup) +{ + if (cgroup) + refcount_inc(&cgroup->refcnt); + return cgroup; +} + int parse_cgroups(const struct option *opt, const char *str, int unset __maybe_unused) { diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h index 69169fbf8d13..34a6c11543dc 100644 --- a/tools/perf/util/cgroup.h +++ b/tools/perf/util/cgroup.h @@ -15,6 +15,7 @@ struct cgroup { extern int nr_cgroups; /* number of explicit cgroups defined */ +struct cgroup *cgroup__get(struct cgroup *cgroup); void cgroup__put(struct cgroup *cgroup); int parse_cgroups(const struct option *opt, const char *str, int unset); -- 2.14.3
