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

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

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

tools/perf/util/cgroup.c

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

tools/perf/util/cgroup.h

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

tools/perf/util/evsel.c

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