From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, mingo@kernel.org,
alexander.shishkin@linux.intel.com, peterz@infradead.org,
namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de,
linux-kernel@vger.kernel.org, jolsa@kernel.org
Subject: [tip:perf/core] perf session: Add 'data_offset' member to reader object
Date: Tue, 22 Jan 2019 02:13:10 -0800 [thread overview]
Message-ID: <tip-71002bd214822a15bee0f7bc033a0dbf95cf780b@git.kernel.org> (raw)
In-Reply-To: <20190110101301.6196-6-jolsa@kernel.org>
Commit-ID: 71002bd214822a15bee0f7bc033a0dbf95cf780b
Gitweb: https://git.kernel.org/tip/71002bd214822a15bee0f7bc033a0dbf95cf780b
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Thu, 10 Jan 2019 11:13:00 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 21 Jan 2019 15:15:57 -0300
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>
---
tools/perf/util/session.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 9f29ed743425..173cf445475c 100644
--- 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) {
next prev parent reply other threads:[~2019-01-22 10:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 10:12 [PATCHv2 0/6] perf session: Add reader object Jiri Olsa
2019-01-10 10:12 ` [PATCH 1/6] perf session: Rearrange perf_session__process_events function Jiri Olsa
2019-01-22 10:10 ` [tip:perf/core] " tip-bot for Jiri Olsa
2019-01-10 10:12 ` [PATCH 2/6] perf session: Get rid of file_size variable Jiri Olsa
2019-01-22 10:11 ` [tip:perf/core] " tip-bot for Jiri Olsa
2019-01-10 10:12 ` [PATCH 3/6] perf session: Add reader object Jiri Olsa
2019-01-22 10:11 ` [tip:perf/core] " tip-bot for Jiri Olsa
2019-01-10 10:12 ` [PATCH 4/6] perf session: Add data_size to " Jiri Olsa
2019-01-22 10:12 ` [tip:perf/core] perf session: Add 'data_size' member " tip-bot for Jiri Olsa
2019-01-10 10:13 ` [PATCH 5/6] perf session: Add data_offset " Jiri Olsa
2019-01-22 10:13 ` tip-bot for Jiri Olsa [this message]
2019-01-10 10:13 ` [PATCH 6/6] perf session: Add reader__process_events function Jiri Olsa
2019-01-22 10:13 ` [tip:perf/core] " tip-bot for Jiri Olsa
2019-01-11 1:31 ` [PATCHv2 0/6] perf session: Add reader object Namhyung Kim
2019-01-11 13:53 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-71002bd214822a15bee0f7bc033a0dbf95cf780b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox