From: Arnaldo Carvalho de Melo <a...@redhat.com> That name isn't used, is shorter, lets switch to it.
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-e51yphwgvepd1y4f5fjpt...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/cgroup.c | 6 +++--- tools/perf/util/cgroup.h | 5 +++-- tools/perf/util/evsel.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 2e2aa6c86107..6ce291f45f2d 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -93,7 +93,7 @@ static int open_cgroup(char *name) static int add_cgroup(struct perf_evlist *evlist, char *str) { struct perf_evsel *counter; - struct cgroup_sel *cgrp = NULL; + struct cgroup *cgrp = NULL; int n; /* * check if cgrp is already defined, if so we reuse it @@ -144,7 +144,7 @@ static int add_cgroup(struct perf_evlist *evlist, char *str) return 0; } -void close_cgroup(struct cgroup_sel *cgrp) +void close_cgroup(struct cgroup *cgrp) { if (cgrp && refcount_dec_and_test(&cgrp->refcnt)) { close(cgrp->fd); @@ -158,7 +158,7 @@ int parse_cgroups(const struct option *opt, const char *str, { struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; struct perf_evsel *counter; - struct cgroup_sel *cgrp = NULL; + struct cgroup *cgrp = NULL; const char *p, *e, *eos = str + strlen(str); char *s; int ret, i; diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h index afafc87e9201..934daa8e4c19 100644 --- a/tools/perf/util/cgroup.h +++ b/tools/perf/util/cgroup.h @@ -6,7 +6,7 @@ struct option; -struct cgroup_sel { +struct cgroup { char *name; int fd; refcount_t refcnt; @@ -14,7 +14,8 @@ struct cgroup_sel { extern int nr_cgroups; /* number of explicit cgroups defined */ -void close_cgroup(struct cgroup_sel *cgrp); +void close_cgroup(struct cgroup *cgrp); + int parse_cgroups(const struct option *opt, const char *str, int unset); #endif /* __CGROUP_H__ */ diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index a7487c6d1866..92ba001b627f 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -30,7 +30,7 @@ struct perf_sample_id { u64 period; }; -struct cgroup_sel; +struct cgroup; /* * The 'struct perf_evsel_config_term' is used to pass event @@ -107,7 +107,7 @@ struct perf_evsel { struct perf_stat_evsel *stats; void *priv; u64 db_id; - struct cgroup_sel *cgrp; + struct cgroup *cgrp; void *handler; struct cpu_map *cpus; struct cpu_map *own_cpus; -- 2.14.3
