[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-f66f0950527cd070d2949a0133275c30e717ba9b@git.kernel.org>
Date: Tue, 22 Jan 2019 02:12:31 -0800
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: alexander.shishkin@...ux.intel.com, hpa@...or.com,
linux-kernel@...r.kernel.org, peterz@...radead.org,
jolsa@...nel.org, acme@...hat.com, mingo@...nel.org,
namhyung@...nel.org, tglx@...utronix.de
Subject: [tip:perf/core] perf session: Add 'data_size' member to reader
object
Commit-ID: f66f0950527cd070d2949a0133275c30e717ba9b
Gitweb: https://git.kernel.org/tip/f66f0950527cd070d2949a0133275c30e717ba9b
Author: Jiri Olsa <jolsa@...nel.org>
AuthorDate: Thu, 10 Jan 2019 11:12:59 +0100
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
perf session: Add 'data_size' member to reader object
Add a 'data_size' member to the reader object. Keep the 'data_size'
variable instead of replacing it with rd.data_size as it will be used in
the following patch.
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
Acked-by: Namhyung Kim <namhyung@...nel.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/20190110101301.6196-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/session.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 06379cc87f59..9f29ed743425 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1822,17 +1822,19 @@ fetch_mmaped_event(struct perf_session *session,
struct reader {
int fd;
+ u64 data_size;
};
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,
};
struct ordered_events *oe = &session->ordered_events;
struct perf_tool *tool = session->tool;
u64 data_offset = session->header.data_offset;
- u64 data_size = session->header.data_size;
+ u64 data_size = rd.data_size;
u64 head, page_offset, file_offset, file_pos, size;
int err, mmap_prot, mmap_flags, map_idx = 0;
size_t mmap_size;
Powered by blists - more mailing lists