perf session: Add 'data_offset' member to reader object

Add 'data_offset' member to reader object.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190110101301.6196-6-jolsa@kernel.org
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 9f29ed743425efbe9e5e863ea37c4203d38e12f1..173cf445475c3bdaa0071f0bf1b19f1b3cc19d1f 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1823,6 +1823,7 @@ fetch_mmaped_event(struct perf_session *session,
 struct reader {
        int     fd;
        u64     data_size;
+       u64     data_offset;
 };
 
 static int __perf_session__process_events(struct perf_session *session)
@@ -1830,10 +1831,10 @@ static int __perf_session__process_events(struct perf_session *session)
        struct reader rd = {
                .fd             = perf_data__fd(session->data),
                .data_size      = session->header.data_size,
+               .data_offset    = session->header.data_offset,
        };
        struct ordered_events *oe = &session->ordered_events;
        struct perf_tool *tool = session->tool;
-       u64 data_offset = session->header.data_offset;
        u64 data_size = rd.data_size;
        u64 head, page_offset, file_offset, file_pos, size;
        int err, mmap_prot, mmap_flags, map_idx = 0;
@@ -1845,16 +1846,16 @@ static int __perf_session__process_events(struct perf_session *session)
 
        perf_tool__fill_defaults(tool);
 
-       page_offset = page_size * (data_offset / page_size);
+       page_offset = page_size * (rd.data_offset / page_size);
        file_offset = page_offset;
-       head = data_offset - page_offset;
+       head = rd.data_offset - page_offset;
 
        if (data_size == 0)
                goto out;
 
        ui_progress__init_size(&prog, data_size, "Processing events...");
 
-       data_size += data_offset;
+       data_size += rd.data_offset;
 
        mmap_size = MMAP_SIZE;
        if (mmap_size > data_size) {