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

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

perf cgroup: Introduce cgroup__new() out of open coded equivalent 

To follow the namespacing convention in tools/perf.

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-jaalyl6bkvvji4r5u8wqw4n4@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b80271f7

tools/perf/util/cgroup.c

+20 −10
Original line number Diff line number Diff line
@@ -109,6 +109,25 @@ static struct cgroup *evlist__find_cgroup(struct perf_evlist *evlist, char *str) 
	return cgrp;

}



static struct cgroup *cgroup__new(char *name)

{

	struct cgroup *cgroup = zalloc(sizeof(*cgroup));



	if (cgroup != NULL) {

		cgroup->name = name;

		refcount_set(&cgroup->refcnt, 1);



		cgroup->fd = open_cgroup(name);

		if (cgroup->fd == -1)

			goto out_err;

	}



	return cgroup;

out_err:

	free(cgroup);

	return NULL;

}



static int add_cgroup(struct perf_evlist *evlist, char *str)

{

	struct perf_evsel *counter;
@@ -116,18 +135,9 @@ static int add_cgroup(struct perf_evlist *evlist, char *str) 
	int n;



	if (!cgrp) {

		cgrp = zalloc(sizeof(*cgrp));

		cgrp = cgroup__new(str);

		if (!cgrp)

			return -1;



		cgrp->name = str;

		refcount_set(&cgrp->refcnt, 1);



		cgrp->fd = open_cgroup(str);

		if (cgrp->fd == -1) {

			free(cgrp);

			return -1;

		}

	}



	/*