diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-06 14:10:45 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-07 14:22:25 +0100 |
| commit | a53b646030ee6f65accdc49e772823b8134a37f6 (patch) | |
| tree | 445a262e5fc0ae190fe07fb6171c945a7691d600 /tools/perf/util | |
| parent | perf cgroup: Introduce cgroup__delete() (diff) | |
| download | linux-a53b646030ee6f65accdc49e772823b8134a37f6.tar.xz linux-a53b646030ee6f65accdc49e772823b8134a37f6.zip | |
perf cgroup: Rename close_cgroup() to cgroup__put()
It is not really closing the cgroup, but instead dropping a reference
count and if it hits zero, then calling delete, which will, among other
cleanup shores, close the cgroup fd.
So it is really dropping a reference to that cgroup, and the method name
for that is "put", so rename close_cgroup() to cgroup__put() to follow
this naming convention.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-sccxpnd7bgwc1llgokt6fcey@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/cgroup.c | 5 | ||||
| -rw-r--r-- | tools/perf/util/cgroup.h | 3 | ||||
| -rw-r--r-- | tools/perf/util/evsel.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 4dd52feb1ae6..b078d54d4245 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -135,9 +135,8 @@ static int add_cgroup(struct perf_evlist *evlist, char *str) goto found; n++; } - if (refcount_dec_and_test(&cgrp->refcnt)) - free(cgrp); + cgroup__put(cgrp); return -1; found: counter->cgrp = cgrp; @@ -151,7 +150,7 @@ static void cgroup__delete(struct cgroup *cgroup) free(cgroup); } -void close_cgroup(struct cgroup *cgrp) +void cgroup__put(struct cgroup *cgrp) { if (cgrp && refcount_dec_and_test(&cgrp->refcnt)) { cgroup__delete(cgrp); diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h index 934daa8e4c19..69169fbf8d13 100644 --- a/tools/perf/util/cgroup.h +++ b/tools/perf/util/cgroup.h @@ -14,7 +14,8 @@ struct cgroup { extern int nr_cgroups; /* number of explicit cgroups defined */ -void close_cgroup(struct cgroup *cgrp); + +void cgroup__put(struct cgroup *cgroup); int parse_cgroups(const struct option *opt, const char *str, int unset); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index b56e1c2ddaee..f1f883bb41a8 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1233,7 +1233,7 @@ void perf_evsel__exit(struct perf_evsel *evsel) perf_evsel__free_fd(evsel); perf_evsel__free_id(evsel); perf_evsel__free_config_terms(evsel); - close_cgroup(evsel->cgrp); + cgroup__put(evsel->cgrp); cpu_map__put(evsel->cpus); cpu_map__put(evsel->own_cpus); thread_map__put(evsel->threads); |