diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:13:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:13:26 +0200 |
| commit | 84b13fd596522db47f9545d5124c30cc00dfdf5a (patch) | |
| tree | c1f51b8fe43a59fb56ea43a18da88c0d0812dd7d /tools/perf/util/trace-event.h | |
| parent | f92128193094c288bc315db1694fafeaeb7ee1d0 (diff) | |
| parent | a0cccc2e8e9fb16cbed3a117b30e3fbac3092ee3 (diff) | |
Merge branch 'perf/live' into perf/core
Conflicts:
tools/perf/builtin-record.c
Merge reason: add the live tracing feature, resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/trace-event.h')
| -rw-r--r-- | tools/perf/util/trace-event.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index 81f2fd20a0e..1f45d468fd9 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -163,7 +163,7 @@ struct record *trace_read_data(int cpu); void parse_set_info(int nr_cpus, int long_sz); -void trace_report(int fd); +ssize_t trace_report(int fd); void *malloc_or_die(unsigned int size); @@ -259,6 +259,8 @@ void *raw_field_ptr(struct event *event, const char *name, void *data); unsigned long long eval_flag(const char *flag); int read_tracing_data(int fd, struct perf_event_attr *pattrs, int nb_events); +ssize_t read_tracing_data_size(int fd, struct perf_event_attr *pattrs, + int nb_events); /* taken from kernel/trace/trace.h */ enum trace_flag_type { |