Preparatory patch for ordered output of perf report -D
Signed-off-by: Thomas Gleixner <[email protected]>
---
tools/perf/util/session.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
Index: linux-2.6-tip/tools/perf/util/session.c
===================================================================
--- linux-2.6-tip.orig/tools/perf/util/session.c
+++ linux-2.6-tip/tools/perf/util/session.c
@@ -465,7 +465,8 @@ static void perf_session_free_sample_buf
static int perf_session_deliver_event(struct perf_session *session,
event_t *event,
struct sample_data *sample,
- struct perf_event_ops *ops);
+ struct perf_event_ops *ops,
+ u64 file_offset);
static void flush_sample_queue(struct perf_session *s,
struct perf_event_ops *ops)
@@ -485,7 +486,8 @@ static void flush_sample_queue(struct pe
break;
event__parse_sample(iter->event, s, &sample);
- perf_session_deliver_event(s, iter->event, &sample, ops);
+ perf_session_deliver_event(s, iter->event, &sample, ops,
+ iter->file_offset);
os->last_flush = iter->timestamp;
list_del(&iter->list);
@@ -699,7 +701,8 @@ static void dump_sample(struct perf_sess
static int perf_session_deliver_event(struct perf_session *session,
event_t *event,
struct sample_data *sample,
- struct perf_event_ops *ops)
+ struct perf_event_ops *ops,
+ u64 file_offset __used)
{
switch (event->header.type) {
case PERF_RECORD_SAMPLE:
@@ -788,7 +791,8 @@ static int perf_session__process_event(s
return ret;
}
- return perf_session_deliver_event(session, event, &sample, ops);
+ return perf_session_deliver_event(session, event, &sample, ops,
+ file_offset);
}
void perf_event_header__bswap(struct perf_event_header *self)
Excerpts from Thomas Gleixner's message of Tue Dec 07 12:48:53 UTC 2010:
> Subject: [patch 5/9] perf: session: Add file_offset to event delivery function
Acked-by: Ian Munsie <[email protected]>
Commit-ID: f74725dcf2f6931c26bc65e77e34e693eeb8441c
Gitweb: http://git.kernel.org/tip/f74725dcf2f6931c26bc65e77e34e693eeb8441c
Author: Thomas Gleixner <[email protected]>
AuthorDate: Tue, 7 Dec 2010 12:48:53 +0000
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 9 Dec 2010 12:09:51 -0200
perf session: Add file_offset to event delivery function
Preparatory patch for ordered output of perf report -D
Acked-by: Ian Munsie <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ian Munsie <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/session.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index a433954..d43e56c 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -465,7 +465,8 @@ static void perf_session_free_sample_buffers(struct perf_session *session)
static int perf_session_deliver_event(struct perf_session *session,
event_t *event,
struct sample_data *sample,
- struct perf_event_ops *ops);
+ struct perf_event_ops *ops,
+ u64 file_offset);
static void flush_sample_queue(struct perf_session *s,
struct perf_event_ops *ops)
@@ -485,7 +486,8 @@ static void flush_sample_queue(struct perf_session *s,
break;
event__parse_sample(iter->event, s, &sample);
- perf_session_deliver_event(s, iter->event, &sample, ops);
+ perf_session_deliver_event(s, iter->event, &sample, ops,
+ iter->file_offset);
os->last_flush = iter->timestamp;
list_del(&iter->list);
@@ -699,7 +701,8 @@ static void dump_sample(struct perf_session *session, event_t *event,
static int perf_session_deliver_event(struct perf_session *session,
event_t *event,
struct sample_data *sample,
- struct perf_event_ops *ops)
+ struct perf_event_ops *ops,
+ u64 file_offset __used)
{
switch (event->header.type) {
case PERF_RECORD_SAMPLE:
@@ -788,7 +791,8 @@ static int perf_session__process_event(struct perf_session *session,
return ret;
}
- return perf_session_deliver_event(session, event, &sample, ops);
+ return perf_session_deliver_event(session, event, &sample, ops,
+ file_offset);
}
void perf_event_header__bswap(struct perf_event_header *self)