diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-16 13:42:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-16 13:44:06 +0100 |
commit | 8b7cdd08fe304b41a2399eaaa5225159ac6db0d8 (patch) | |
tree | 77aecdeaf0a9127717211d27c0fdff6e357846e4 /tools/perf/util/trace-event.h | |
parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | perf evlist: New command to list the names of events present in a perf.data file (diff) | |
download | linux-8b7cdd08fe304b41a2399eaaa5225159ac6db0d8.tar.xz linux-8b7cdd08fe304b41a2399eaaa5225159ac6db0d8.zip |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
Diffstat (limited to 'tools/perf/util/trace-event.h')
-rw-r--r-- | tools/perf/util/trace-event.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index b5f12ca24d99..b04da5722437 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -3,6 +3,7 @@ #include <stdbool.h> #include "parse-events.h" +#include "session.h" #define __unused __attribute__((unused)) @@ -176,8 +177,7 @@ void print_printk(void); int parse_ftrace_file(char *buf, unsigned long size); int parse_event_file(char *buf, unsigned long size, char *sys); -void print_event(int cpu, void *data, int size, unsigned long long nsecs, - char *comm); +void print_trace_event(int cpu, void *data, int size); extern int file_bigendian; extern int host_bigendian; @@ -278,8 +278,10 @@ struct scripting_ops { const char *name; int (*start_script) (const char *script, int argc, const char **argv); int (*stop_script) (void); - void (*process_event) (int cpu, void *data, int size, - unsigned long long nsecs, char *comm); + void (*process_event) (union perf_event *event, + struct perf_sample *sample, + struct perf_session *session, + struct thread *thread); int (*generate_script) (const char *outfile); }; |