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>,
Riccardo Mancini <rickyman7@gmail.com>
Subject: [PATCH v9 18/24] perf session: Introduce reader_state in reader object
Date: Fri, 2 Jul 2021 15:32:26 +0300 [thread overview]
Message-ID: <20d08766e4bb9a1d9f6b5464149a9b82ac4080e8.1625227739.git.alexey.v.bayduraev@linux.intel.com> (raw)
In-Reply-To: <cover.1625227739.git.alexey.v.bayduraev@linux.intel.com>
We need all the state info about reader in separate object to load data
from multiple files, so we can keep multiple readers at the same time.
Adding struct reader_state and adding all items that need to be kept.
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>
Acked-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
---
tools/perf/util/session.c | 74 +++++++++++++++++++++++----------------
1 file changed, 43 insertions(+), 31 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 1cfb5655e092..da39ce4acb5a 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -55,6 +55,17 @@ typedef s64 (*reader_cb_t)(struct perf_session *session,
u64 file_offset,
const char *file_path);
+struct reader_state {
+ char *mmaps[NUM_MMAPS];
+ size_t mmap_size;
+ int mmap_idx;
+ char *mmap_cur;
+ u64 file_pos;
+ u64 file_offset;
+ u64 data_size;
+ u64 head;
+};
+
struct reader {
int fd;
const char *path;
@@ -62,6 +73,7 @@ struct reader {
u64 data_offset;
reader_cb_t process;
bool in_place_update;
+ struct reader_state state;
};
#ifdef HAVE_ZSTD_SUPPORT
@@ -2178,29 +2190,28 @@ static int
reader__process_events(struct reader *rd, struct perf_session *session,
struct ui_progress *prog)
{
- u64 data_size = rd->data_size;
- u64 head, page_offset, file_offset, file_pos, size;
- int err = 0, mmap_prot, mmap_flags, map_idx = 0;
- size_t mmap_size;
- char *buf, *mmaps[NUM_MMAPS];
+ struct reader_state *st = &rd->state;
+ u64 page_offset, size;
+ int err = 0, mmap_prot, mmap_flags;
+ char *buf, **mmaps = st->mmaps;
union perf_event *event;
s64 skip;
page_offset = page_size * (rd->data_offset / page_size);
- file_offset = page_offset;
- head = rd->data_offset - page_offset;
+ st->file_offset = page_offset;
+ st->head = rd->data_offset - page_offset;
- ui_progress__init_size(prog, data_size, "Processing events...");
+ ui_progress__init_size(prog, rd->data_size, "Processing events...");
- data_size += rd->data_offset;
+ st->data_size = rd->data_size + rd->data_offset;
- mmap_size = MMAP_SIZE;
- if (mmap_size > data_size) {
- mmap_size = data_size;
+ st->mmap_size = MMAP_SIZE;
+ if (st->mmap_size > st->data_size) {
+ st->mmap_size = st->data_size;
session->one_mmap = true;
}
- memset(mmaps, 0, sizeof(mmaps));
+ memset(mmaps, 0, sizeof(st->mmaps));
mmap_prot = PROT_READ;
mmap_flags = MAP_SHARED;
@@ -2212,35 +2223,36 @@ reader__process_events(struct reader *rd, struct perf_session *session,
mmap_flags = MAP_PRIVATE;
}
remap:
- buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, rd->fd,
- file_offset);
+ buf = mmap(NULL, st->mmap_size, mmap_prot, mmap_flags, rd->fd,
+ st->file_offset);
if (buf == MAP_FAILED) {
pr_err("failed to mmap file\n");
err = -errno;
goto out;
}
- mmaps[map_idx] = buf;
- map_idx = (map_idx + 1) & (ARRAY_SIZE(mmaps) - 1);
- file_pos = file_offset + head;
+ 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;
if (session->one_mmap) {
session->one_mmap_addr = buf;
- session->one_mmap_offset = file_offset;
+ session->one_mmap_offset = st->file_offset;
}
more:
- event = fetch_mmaped_event(head, mmap_size, buf, session->header.needs_swap);
+ 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) {
- if (mmaps[map_idx]) {
- munmap(mmaps[map_idx], mmap_size);
- mmaps[map_idx] = NULL;
+ if (mmaps[st->mmap_idx]) {
+ munmap(mmaps[st->mmap_idx], st->mmap_size);
+ mmaps[st->mmap_idx] = NULL;
}
- page_offset = page_size * (head / page_size);
- file_offset += page_offset;
- head -= page_offset;
+ page_offset = page_size * (st->head / page_size);
+ st->file_offset += page_offset;
+ st->head -= page_offset;
goto remap;
}
@@ -2249,9 +2261,9 @@ reader__process_events(struct reader *rd, struct perf_session *session,
skip = -EINVAL;
if (size < sizeof(struct perf_event_header) ||
- (skip = rd->process(session, event, file_pos, rd->path)) < 0) {
+ (skip = rd->process(session, event, st->file_pos, rd->path)) < 0) {
pr_err("%#" PRIx64 " [%s] [%#x]: failed to process type: %d [%s]\n",
- file_offset + head, rd->path, event->header.size,
+ st->file_offset + st->head, rd->path, event->header.size,
event->header.type, strerror(-skip));
err = skip;
goto out;
@@ -2260,8 +2272,8 @@ reader__process_events(struct reader *rd, struct perf_session *session,
if (skip)
size += skip;
- head += size;
- file_pos += size;
+ st->head += size;
+ st->file_pos += size;
err = __perf_session__process_decomp_events(session);
if (err)
@@ -2272,7 +2284,7 @@ reader__process_events(struct reader *rd, struct perf_session *session,
if (session_done())
goto out;
- if (file_pos < data_size)
+ if (st->file_pos < st->data_size)
goto more;
out:
--
2.19.0
next prev parent reply other threads:[~2021-07-02 12:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 12:32 [PATCH v9 00/24] Introduce threaded trace streaming for basic perf record operation Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 01/24] perf record: Introduce thread affinity and mmap masks Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 02/24] tools lib: Introduce fdarray clone function Alexey Bayduraev
2021-07-02 18:15 ` Arnaldo Carvalho de Melo
2021-07-02 12:32 ` [PATCH v9 03/24] perf record: Introduce thread specific data array Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 04/24] perf record: Introduce function to propagate control commands Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 05/24] perf record: Introduce thread local variable Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 06/24] perf record: Stop threads in the end of trace streaming Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 07/24] perf record: Start threads in the beginning " Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 08/24] perf record: Introduce data file at mmap buffer object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 09/24] perf record: Introduce bytes written stats to support --max-size option Alexey Bayduraev
2021-07-09 5:38 ` Namhyung Kim
2021-07-02 12:32 ` [PATCH v9 10/24] perf record: Introduce data transferred and compressed stats Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 11/24] perf record: Init data file at mmap buffer object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 12/24] perf record: Introduce --threads command line option Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 13/24] perf record: Extend " Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 14/24] perf record: Implement compatibility checks Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 15/24] perf report: Output non-zero offset for decompressed records Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 16/24] perf report: Output data file name in raw trace dump Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 17/24] perf session: Move reader structure to the top Alexey Bayduraev
2021-07-02 12:32 ` Alexey Bayduraev [this message]
2021-07-02 12:32 ` [PATCH v9 19/24] perf session: Introduce reader objects in session object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 20/24] perf session: Introduce decompressor into trace reader object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 21/24] perf session: Move init into reader__init function Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 22/24] perf session: Move map/unmap into reader__mmap function Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 23/24] perf session: Load single file for analysis Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 24/24] perf session: Load data directory files " Alexey Bayduraev
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=20d08766e4bb9a1d9f6b5464149a9b82ac4080e8.1625227739.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 \
--cc=rickyman7@gmail.com \
/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).