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

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

perf evsel: Introduce perf_evsel__{in,ex}it 



Out of the {con,des}structor, as in interpreted language bindings we will
need to go back from the wrapper object to the real thing. In that case
using container_of will save us to have an extra pointer in the perf_evsel
struct.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d0dd74e8

tools/perf/util/evlist.c

+20 −9
Original line number Diff line number Diff line
@@ -6,11 +6,8 @@ 
#include <linux/bitops.h>

#include <linux/hash.h>



struct perf_evlist *perf_evlist__new(void)

void perf_evlist__init(struct perf_evlist *evlist)

{

	struct perf_evlist *evlist = zalloc(sizeof(*evlist));



	if (evlist != NULL) {

	int i;



	for (i = 0; i < PERF_EVLIST__HLIST_SIZE; ++i)
@@ -18,6 +15,13 @@ struct perf_evlist *perf_evlist__new(void) 
	INIT_LIST_HEAD(&evlist->entries);

}



struct perf_evlist *perf_evlist__new(void)

{

	struct perf_evlist *evlist = zalloc(sizeof(*evlist));



	if (evlist != NULL)

		perf_evlist__init(evlist);



	return evlist;

}
@@ -33,11 +37,18 @@ static void perf_evlist__purge(struct perf_evlist *evlist) 
	evlist->nr_entries = 0;

}



void perf_evlist__delete(struct perf_evlist *evlist)

void perf_evlist__exit(struct perf_evlist *evlist)

{

	perf_evlist__purge(evlist);

	free(evlist->mmap);

	free(evlist->pollfd);

	evlist->mmap = NULL;

	evlist->pollfd = NULL;

}



void perf_evlist__delete(struct perf_evlist *evlist)

{

	perf_evlist__purge(evlist);

	perf_evlist__exit(evlist);

	free(evlist);

}

tools/perf/util/evlist.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ struct perf_evlist { 
struct perf_evsel;



struct perf_evlist *perf_evlist__new(void);

void perf_evlist__init(struct perf_evlist *evlist);

void perf_evlist__exit(struct perf_evlist *evlist);

void perf_evlist__delete(struct perf_evlist *evlist);



void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry);

tools/perf/util/evsel.c

+16 −6
Original line number Diff line number Diff line
@@ -14,16 +14,21 @@ 
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))

#define SID(e, x, y) xyarray__entry(e->id, x, y)



struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx)

void perf_evsel__init(struct perf_evsel *evsel,

		      struct perf_event_attr *attr, int idx)

{

	struct perf_evsel *evsel = zalloc(sizeof(*evsel));



	if (evsel != NULL) {

	evsel->idx	   = idx;

	evsel->attr	   = *attr;

	INIT_LIST_HEAD(&evsel->node);

}



struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx)

{

	struct perf_evsel *evsel = zalloc(sizeof(*evsel));



	if (evsel != NULL)

		perf_evsel__init(evsel, attr, idx);



	return evsel;

}
@@ -87,11 +92,16 @@ int perf_evlist__alloc_mmap(struct perf_evlist *evlist, int ncpus) 
	return evlist->mmap != NULL ? 0 : -ENOMEM;

}



void perf_evsel__delete(struct perf_evsel *evsel)

void perf_evsel__exit(struct perf_evsel *evsel)

{

	assert(list_empty(&evsel->node));

	xyarray__delete(evsel->fd);

	xyarray__delete(evsel->id);

}



void perf_evsel__delete(struct perf_evsel *evsel)

{

	perf_evsel__exit(evsel);

	free(evsel);

}

tools/perf/util/evsel.h

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ struct thread_map; 
struct perf_evlist;



struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx);

void perf_evsel__init(struct perf_evsel *evsel,

		      struct perf_event_attr *attr, int idx);

void perf_evsel__exit(struct perf_evsel *evsel);

void perf_evsel__delete(struct perf_evsel *evsel);



int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);