From: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Alexander Antonov <alexander.antonov@linux.intel.com>,
Alexei Budankov <abudankov@huawei.com>
Subject: [PATCH v5 19/20] perf session: load single file for analysis
Date: Tue, 4 May 2021 10:04:54 +0300 [thread overview]
Message-ID: <9d4faff5efce9462714a9bb7dd4ec80a02a82751.1619781188.git.alexey.v.bayduraev@linux.intel.com> (raw)
In-Reply-To: <cover.1619781188.git.alexey.v.bayduraev@linux.intel.com>
Adding eof flag to reader state and moving the check to reader__mmap.
Separating reading code of single event into reader__read_event function.
Adding basic reader return codes to simplify the code and introducing
reader remmap/read_event loop based on them.
Design and implementation are based on the prototype [1], [2].
[1] git clone https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git -b perf/record_threads
[2] https://lore.kernel.org/lkml/20180913125450.21342-1-jolsa@kernel.org/
Suggested-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
---
tools/perf/util/session.c | 71 ++++++++++++++++++++++++---------------
1 file changed, 44 insertions(+), 27 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 5bb3babeeb94..47a414016510 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -64,6 +64,12 @@ struct reader_state {
u64 file_offset;
u64 data_size;
u64 head;
+ bool eof;
+};
+
+enum {
+ READER_EOF = 0,
+ READER_OK = 1,
};
struct reader {
@@ -2241,6 +2247,11 @@ reader__mmap(struct reader *rd, struct perf_session *session)
char *buf, **mmaps = st->mmaps;
u64 page_offset;
+ if (st->file_pos >= st->data_size) {
+ st->eof = true;
+ return READER_EOF;
+ }
+
mmap_prot = PROT_READ;
mmap_flags = MAP_SHARED;
@@ -2267,36 +2278,26 @@ reader__mmap(struct reader *rd, struct perf_session *session)
mmaps[st->mmap_idx] = st->mmap_cur = buf;
st->mmap_idx = (st->mmap_idx + 1) & (ARRAY_SIZE(st->mmaps) - 1);
st->file_pos = st->file_offset + st->head;
- return 0;
+ return READER_OK;
}
static int
-reader__process_events(struct reader *rd, struct perf_session *session,
- struct ui_progress *prog)
+reader__read_event(struct reader *rd, struct perf_session *session,
+ struct ui_progress *prog)
{
struct reader_state *st = &rd->state;
- u64 size;
- int err = 0;
+ int err = READER_OK;
union perf_event *event;
+ u64 size;
s64 skip;
-remap:
- err = reader__mmap(rd, session);
- if (err)
- goto out;
- if (session->one_mmap) {
- session->one_mmap_addr = rd->state.mmap_cur;
- session->one_mmap_offset = rd->state.file_offset;
- }
-
-more:
event = fetch_mmaped_event(st->head, st->mmap_size, st->mmap_cur,
session->header.needs_swap);
if (IS_ERR(event))
return PTR_ERR(event);
if (!event)
- goto remap;
+ return READER_EOF;
session->active_reader = rd;
size = event->header.size;
@@ -2318,18 +2319,12 @@ reader__process_events(struct reader *rd, struct perf_session *session,
st->head += size;
st->file_pos += size;
- err = __perf_session__process_decomp_events(session);
- if (err)
- goto out;
+ skip = __perf_session__process_decomp_events(session);
+ if (skip)
+ err = skip;
ui_progress__update(prog, size);
- if (session_done())
- goto out;
-
- if (st->file_pos < st->data_size)
- goto more;
-
out:
session->active_reader = NULL;
return err;
@@ -2372,9 +2367,31 @@ static int __perf_session__process_events(struct perf_session *session)
err = reader__init(rd, &session->one_mmap);
if (err)
goto out_err;
- err = reader__process_events(rd, session, &prog);
- if (err)
+ err = reader__mmap(rd, session);
+ if (err != READER_OK) {
+ if (err == READER_EOF)
+ err = -EINVAL;
goto out_err;
+ }
+ if (session->one_mmap) {
+ session->one_mmap_addr = rd->state.mmap_cur;
+ session->one_mmap_offset = rd->state.file_offset;
+ }
+
+ while (true) {
+ if (session_done())
+ break;
+
+ err = reader__read_event(rd, session, &prog);
+ if (err < 0)
+ break;
+ if (err == READER_EOF) {
+ err = reader__mmap(rd, session);
+ if (err <= 0)
+ break;
+ }
+ }
+
/* do the final flush for ordered samples */
err = ordered_events__flush(oe, OE_FLUSH__FINAL);
if (err)
--
2.19.0
next prev parent reply other threads:[~2021-05-04 7:06 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 7:04 [PATCH v5 00/20] Introduce threaded trace streaming for basic perf record operation Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 01/20] perf record: introduce thread affinity and mmap masks Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 02/20] perf record: introduce thread specific data array Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 03/20] perf record: introduce thread local variable Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 04/20] perf record: stop threads in the end of trace streaming Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 05/20] perf record: start threads in the beginning " Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 06/20] perf record: introduce data file at mmap buffer object Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 07/20] perf record: introduce data transferred and compressed stats Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 08/20] perf record: init data file at mmap buffer object Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 09/20] tools lib: introduce bitmap_intersects() operation Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 10/20] perf record: introduce --threads=<spec> command line option Alexey Bayduraev
2021-05-21 6:50 ` Namhyung Kim
2021-05-04 7:04 ` [PATCH v5 11/20] perf record: document parallel data streaming mode Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 12/20] perf report: output data file name in raw trace dump Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 13/20] perf session: move reader structure to the top Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 14/20] perf session: introduce reader_state in reader object Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 15/20] perf session: introduce reader objects in session object Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 16/20] perf session: introduce decompressor into trace reader object Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 17/20] perf session: move init into reader__init function Alexey Bayduraev
2021-05-04 7:04 ` [PATCH v5 18/20] perf session: move map/unmap into reader__mmap function Alexey Bayduraev
2021-05-04 7:04 ` Alexey Bayduraev [this message]
2021-05-04 7:04 ` [PATCH v5 20/20] perf session: load data directory files for analysis Alexey Bayduraev
2021-05-06 6:20 ` [PATCH v5 00/20] Introduce threaded trace streaming for basic perf record operation Namhyung Kim
2021-05-06 12:43 ` Bayduraev, Alexey V
2021-05-07 4:47 ` Namhyung Kim
2021-05-06 14:17 ` Andi Kleen
2021-05-07 4:52 ` Namhyung Kim
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=9d4faff5efce9462714a9bb7dd4ec80a02a82751.1619781188.git.alexey.v.bayduraev@linux.intel.com \
--to=alexey.v.bayduraev@linux.intel.com \
--cc=abudankov@huawei.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.antonov@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).