perf session: Store file offset in sample_queue

Preparatory patch for ordered output of perf report -D.

Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ian Munsie <imunsie@au1.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20101207124550.725128545@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 12761d5bc92a2d63a4a6e282b16302c49029bdb6..a4339548de67207659fc1d3fe0fc48d229801fd6 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -444,6 +444,7 @@ static event__swap_op event__swap_ops[] = {
 
 struct sample_queue {
        u64                     timestamp;
+       u64                     file_offset;
        event_t                 *event;
        struct list_head        list;
 };
@@ -596,7 +597,7 @@ static void __queue_event(struct sample_queue *new, struct perf_session *s)
 #define MAX_SAMPLE_BUFFER      (64 * 1024 / sizeof(struct sample_queue))
 
 static int perf_session_queue_event(struct perf_session *s, event_t *event,
-                                   struct sample_data *data)
+                                   struct sample_data *data, u64 file_offset)
 {
        struct ordered_samples *os = &s->ordered_samples;
        struct list_head *sc = &os->sample_cache;
@@ -628,6 +629,7 @@ static int perf_session_queue_event(struct perf_session *s, event_t *event,
        }
 
        new->timestamp = timestamp;
+       new->file_offset = file_offset;
        new->event = event;
 
        __queue_event(new, s);
@@ -780,7 +782,8 @@ static int perf_session__process_event(struct perf_session *session,
        }
 
        if (ops->ordered_samples) {
-               ret = perf_session_queue_event(session, event, &sample);
+               ret = perf_session_queue_event(session, event, &sample,
+                                              file_offset);
                if (ret != -ETIME)
                        return ret;
        }