Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ca32f69 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a6adc9bd

tools/perf/util/cgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

tools/perf/util/cgroup.h

+3 −2
Original line number Diff line number Diff line
@@ -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__ */

tools/perf/util/evsel.h

+2 −2
Original line number Diff line number Diff line
@@ -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;