diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 14:45:54 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 14:45:54 +0100 |
| commit | 7c940c18c57e45910f7dd9a4011c4658cacba4b6 (patch) | |
| tree | d161ba063e2c959984f7a7126c3ed3be2a595d70 /tools/perf/util/event.h | |
| parent | perf annotate: Fix annotate context lines regression (diff) | |
| parent | perf tools: Fix thread_map event synthesizing in top and record (diff) | |
| download | linux-7c940c18c57e45910f7dd9a4011c4658cacba4b6.tar.xz linux-7c940c18c57e45910f7dd9a4011c4658cacba4b6.zip | |
Merge remote branch 'acme/perf/urgent' into perf/core
Fixups due to rename of event_t routines from event__ to perf_event__
done in perf/core.
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/event.h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/event.h')
| -rw-r--r-- | tools/perf/util/event.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index eecb42273d59..9c35170fb379 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -135,6 +135,7 @@ union perf_event { void perf_event__print_totals(void); struct perf_session; +struct thread_map; typedef int (*perf_event__handler_synth_t)(union perf_event *event, struct perf_session *session); @@ -142,8 +143,9 @@ typedef int (*perf_event__handler_t)(union perf_event *event, struct perf_sample *sample, struct perf_session *session); -int perf_event__synthesize_thread(pid_t pid, perf_event__handler_t process, - struct perf_session *session); +int perf_event__synthesize_thread_map(struct thread_map *threads, + perf_event__handler_t process, + struct perf_session *session); int perf_event__synthesize_threads(perf_event__handler_t process, struct perf_session *session); int perf_event__synthesize_kernel_mmap(perf_event__handler_t process, |