lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf evsel: Introduce perf_evsel__{in,ex}it

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2011-01-18 21:41:45 -02:00
parent d0dd74e853
commit ef1d1af28c
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tools/perf/util/evlist.c
View File

@@ -6,17 +6,21 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/hash.h> #include <linux/hash.h>
void perf_evlist__init(struct perf_evlist *evlist)
{
int i;
for (i = 0; i < PERF_EVLIST__HLIST_SIZE; ++i)
INIT_HLIST_HEAD(&evlist->heads[i]);
INIT_LIST_HEAD(&evlist->entries);
}
struct perf_evlist *perf_evlist__new(void) struct perf_evlist *perf_evlist__new(void)
{ {
struct perf_evlist *evlist = zalloc(sizeof(*evlist)); struct perf_evlist *evlist = zalloc(sizeof(*evlist));
if (evlist != NULL) { if (evlist != NULL)
int i; perf_evlist__init(evlist);
for (i = 0; i < PERF_EVLIST__HLIST_SIZE; ++i)
INIT_HLIST_HEAD(&evlist->heads[i]);
INIT_LIST_HEAD(&evlist->entries);
}
return evlist; return evlist;
} }
@@ -33,11 +37,18 @@ static void perf_evlist__purge(struct perf_evlist *evlist)
evlist->nr_entries = 0; evlist->nr_entries = 0;
} }
void perf_evlist__exit(struct perf_evlist *evlist)
{
free(evlist->mmap);
free(evlist->pollfd);
evlist->mmap = NULL;
evlist->pollfd = NULL;
}
void perf_evlist__delete(struct perf_evlist *evlist) void perf_evlist__delete(struct perf_evlist *evlist)
{ {
perf_evlist__purge(evlist); perf_evlist__purge(evlist);
free(evlist->mmap); perf_evlist__exit(evlist);
free(evlist->pollfd);
free(evlist); free(evlist);
} }

2
tools/perf/util/evlist.h
View File

@@ -24,6 +24,8 @@ struct perf_evlist {
struct perf_evsel; struct perf_evsel;
struct perf_evlist *perf_evlist__new(void); 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__delete(struct perf_evlist *evlist);
void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry); void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry);

22
tools/perf/util/evsel.c
View File

@@ -14,15 +14,20 @@
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
#define SID(e, x, y) xyarray__entry(e->id, x, y) #define SID(e, x, y) xyarray__entry(e->id, x, y)
void perf_evsel__init(struct perf_evsel *evsel,
struct perf_event_attr *attr, int idx)
{
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 *perf_evsel__new(struct perf_event_attr *attr, int idx)
{ {
struct perf_evsel *evsel = zalloc(sizeof(*evsel)); struct perf_evsel *evsel = zalloc(sizeof(*evsel));
if (evsel != NULL) { if (evsel != NULL)
evsel->idx = idx; perf_evsel__init(evsel, attr, idx);
evsel->attr = *attr;
INIT_LIST_HEAD(&evsel->node);
}
return evsel; return evsel;
} }
@@ -87,11 +92,16 @@ int perf_evlist__alloc_mmap(struct perf_evlist *evlist, int ncpus)
return evlist->mmap != NULL ? 0 : -ENOMEM; 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)); assert(list_empty(&evsel->node));
xyarray__delete(evsel->fd); xyarray__delete(evsel->fd);
xyarray__delete(evsel->id); xyarray__delete(evsel->id);
}
void perf_evsel__delete(struct perf_evsel *evsel)
{
perf_evsel__exit(evsel);
free(evsel); free(evsel);
} }

3
tools/perf/util/evsel.h
View File

@@ -52,6 +52,9 @@ struct thread_map;
struct perf_evlist; struct perf_evlist;
struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx); 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); void perf_evsel__delete(struct perf_evsel *evsel);
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads); int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);