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/session.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/session.h')
| -rw-r--r-- | tools/perf/util/session.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 27f4c2dc715..0ac14d42dc2 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -27,6 +27,7 @@ struct perf_session { u64 sample_type; struct ref_reloc_sym ref_reloc_sym; int fd; + bool fd_pipe; int cwdlen; char *cwd; char filename[0]; @@ -43,7 +44,11 @@ struct perf_event_ops { lost, read, throttle, - unthrottle; + unthrottle, + attr, + event_type, + tracing_data, + build_id; }; struct perf_session *perf_session__new(const char *filename, int mode, bool force); @@ -92,6 +97,9 @@ static inline struct map * return map_groups__new_module(&self->kmaps, start, filename); } +int do_read(int fd, void *buf, size_t size); +void perf_session__update_sample_type(struct perf_session *self); + #ifdef NO_NEWT_SUPPORT static inline int perf_session__browse_hists(struct rb_root *hists __used, u64 nr_hists __used, |