perf cgroup: Rename 'struct cgroup_sel' to 'struct cgroup'

That name isn't used, is shorter, lets switch to it.

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-e51yphwgvepd1y4f5fjptmjq@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index 2e2aa6c861071620d9c9dbf10164c8bfee31e1cf..6ce291f45f2dd87710191a078d055ffc3fb4f10a 100644 (file)
--- 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 @@ found:
        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 afafc87e920147e1a039e05dd5662c37f76778e3..934daa8e4c197729bcef4ce2e611fa58d8fed4ef 100644 (file)
--- 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 a7487c6d186607e9ca9fc4858c36c29f82015e1d..92ba001b627fd5d5be13850a236981ff0a0e39f4 100644 (file)
--- 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;