diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-29 11:01:45 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-29 13:25:37 -0500 |
commit | 8115d60c323dd9931b95221c0a392aeddc1d6ef3 (patch) | |
tree | 13e75d71c5163c78efc9d8ab33988cc6c7be74a1 /tools/perf/util/evlist.c | |
parent | 8d50e5b4171a69cf48ca94a1e7c14033d0b4771d (diff) |
perf tools: Kill event_t typedef, use 'union perf_event' instead
And move the event_t methods to the perf_event__ too.
No code changes, just namespace consistency.
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>
Diffstat (limited to 'tools/perf/util/evlist.c')
-rw-r--r-- | tools/perf/util/evlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index b498eecbe850..917fc18d0bed 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c | |||
@@ -107,7 +107,7 @@ struct perf_evsel *perf_evlist__id2evsel(struct perf_evlist *evlist, u64 id) | |||
107 | return NULL; | 107 | return NULL; |
108 | } | 108 | } |
109 | 109 | ||
110 | event_t *perf_evlist__read_on_cpu(struct perf_evlist *evlist, int cpu) | 110 | union perf_event *perf_evlist__read_on_cpu(struct perf_evlist *evlist, int cpu) |
111 | { | 111 | { |
112 | /* XXX Move this to perf.c, making it generally available */ | 112 | /* XXX Move this to perf.c, making it generally available */ |
113 | unsigned int page_size = sysconf(_SC_PAGE_SIZE); | 113 | unsigned int page_size = sysconf(_SC_PAGE_SIZE); |
@@ -115,7 +115,7 @@ event_t *perf_evlist__read_on_cpu(struct perf_evlist *evlist, int cpu) | |||
115 | unsigned int head = perf_mmap__read_head(md); | 115 | unsigned int head = perf_mmap__read_head(md); |
116 | unsigned int old = md->prev; | 116 | unsigned int old = md->prev; |
117 | unsigned char *data = md->base + page_size; | 117 | unsigned char *data = md->base + page_size; |
118 | event_t *event = NULL; | 118 | union perf_event *event = NULL; |
119 | 119 | ||
120 | if (evlist->overwrite) { | 120 | if (evlist->overwrite) { |
121 | /* | 121 | /* |
@@ -140,7 +140,7 @@ event_t *perf_evlist__read_on_cpu(struct perf_evlist *evlist, int cpu) | |||
140 | if (old != head) { | 140 | if (old != head) { |
141 | size_t size; | 141 | size_t size; |
142 | 142 | ||
143 | event = (event_t *)&data[old & md->mask]; | 143 | event = (union perf_event *)&data[old & md->mask]; |
144 | size = event->header.size; | 144 | size = event->header.size; |
145 | 145 | ||
146 | /* | 146 | /* |