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

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

perf cgroup: Use atomic.h for refcounting 

Now that we have atomic.h, we should convert all of the existing
refcounts to use it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-t3v2uma5digcj2tpkrs3m84u@git.kernel.org


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

tools/perf/util/cgroup.c

+3 −7
Original line number Diff line number Diff line
@@ -115,23 +115,19 @@ static int add_cgroup(struct perf_evlist *evlist, char *str) 
			goto found;

		n++;

	}

	if (cgrp->refcnt == 0)

	if (atomic_read(&cgrp->refcnt) == 0)

		free(cgrp);



	return -1;

found:

	cgrp->refcnt++;

	atomic_inc(&cgrp->refcnt);

	counter->cgrp = cgrp;

	return 0;

}



void close_cgroup(struct cgroup_sel *cgrp)

{

	if (!cgrp)

		return;



	/* XXX: not reentrant */

	if (--cgrp->refcnt == 0) {

	if (cgrp && atomic_dec_and_test(&cgrp->refcnt)) {

		close(cgrp->fd);

		zfree(&cgrp->name);

		free(cgrp);

tools/perf/util/cgroup.h

+3 −1
Original line number Diff line number Diff line 
#ifndef __CGROUP_H__

#define __CGROUP_H__



#include <linux/atomic.h>



struct option;



struct cgroup_sel {

	char *name;

	int fd;

	int refcnt;

	atomic_t refcnt;

};