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 v3 2/8] perf session: Introduce decompressor in reader object
Date: Thu, 7 Oct 2021 13:25:37 +0300 [thread overview]
Message-ID: <664203f1a6aee3ca9dd5ea3d5a92dd707ebda9a8.1633596227.git.alexey.v.bayduraev@linux.intel.com> (raw)
In-Reply-To: <cover.1633596227.git.alexey.v.bayduraev@linux.intel.com>
Introducing decompressor data structure with pointers to decomp
objects and to zstd object. We cannot just move session->zstd_data to
decomp_data as session->zstd_data is used not only for decompression.
Adding decompressor data object to reader object and introducing
active_decomp into perf_session object to select current decompressor.
Thus decompression could be executed separately for each data file.
Acked-by: Namhyung Kim <namhyung@gmail.com>
Reviewed-by: Riccardo Mancini <rickyman7@gmail.com>
Tested-by: Riccardo Mancini <rickyman7@gmail.com>
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
---
tools/perf/util/session.c | 39 +++++++++++++++++++++++++--------------
tools/perf/util/session.h | 10 ++++++++--
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index bf73e8c1f15c..c3930c49da7a 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -44,7 +44,7 @@ static int perf_session__process_compressed_event(struct perf_session *session,
size_t decomp_size, src_size;
u64 decomp_last_rem = 0;
size_t mmap_len, decomp_len = session->header.env.comp_mmap_len;
- struct decomp *decomp, *decomp_last = session->decomp_last;
+ struct decomp *decomp, *decomp_last = session->active_decomp->decomp_last;
if (decomp_last) {
decomp_last_rem = decomp_last->size - decomp_last->head;
@@ -71,7 +71,7 @@ static int perf_session__process_compressed_event(struct perf_session *session,
src = (void *)event + sizeof(struct perf_record_compressed);
src_size = event->pack.header.size - sizeof(struct perf_record_compressed);
- decomp_size = zstd_decompress_stream(&(session->zstd_data), src, src_size,
+ decomp_size = zstd_decompress_stream(session->active_decomp->zstd_decomp, src, src_size,
&(decomp->data[decomp_last_rem]), decomp_len - decomp_last_rem);
if (!decomp_size) {
munmap(decomp, mmap_len);
@@ -81,13 +81,12 @@ static int perf_session__process_compressed_event(struct perf_session *session,
decomp->size += decomp_size;
- if (session->decomp == NULL) {
- session->decomp = decomp;
- session->decomp_last = decomp;
- } else {
- session->decomp_last->next = decomp;
- session->decomp_last = decomp;
- }
+ if (session->active_decomp->decomp == NULL)
+ session->active_decomp->decomp = decomp;
+ else
+ session->active_decomp->decomp_last->next = decomp;
+
+ session->active_decomp->decomp_last = decomp;
pr_debug("decomp (B): %zd to %zd\n", src_size, decomp_size);
@@ -197,6 +196,8 @@ struct perf_session *__perf_session__new(struct perf_data *data,
session->repipe = repipe;
session->tool = tool;
+ session->decomp_data.zstd_decomp = &session->zstd_data;
+ session->active_decomp = &session->decomp_data;
INIT_LIST_HEAD(&session->auxtrace_index);
machines__init(&session->machines);
ordered_events__init(&session->ordered_events,
@@ -276,11 +277,11 @@ static void perf_session__delete_threads(struct perf_session *session)
machine__delete_threads(&session->machines.host);
}
-static void perf_session__release_decomp_events(struct perf_session *session)
+static void perf_decomp__release_events(struct decomp *next)
{
- struct decomp *next, *decomp;
+ struct decomp *decomp;
size_t mmap_len;
- next = session->decomp;
+
do {
decomp = next;
if (decomp == NULL)
@@ -299,7 +300,7 @@ void perf_session__delete(struct perf_session *session)
auxtrace_index__free(&session->auxtrace_index);
perf_session__destroy_kernel_maps(session);
perf_session__delete_threads(session);
- perf_session__release_decomp_events(session);
+ perf_decomp__release_events(session->decomp_data.decomp);
perf_env__exit(&session->header.env);
machines__exit(&session->machines);
if (session->data) {
@@ -2117,7 +2118,7 @@ static int __perf_session__process_decomp_events(struct perf_session *session)
{
s64 skip;
u64 size, file_pos = 0;
- struct decomp *decomp = session->decomp_last;
+ struct decomp *decomp = session->active_decomp->decomp_last;
if (!decomp)
return 0;
@@ -2178,6 +2179,8 @@ struct reader {
u64 file_pos;
u64 file_offset;
u64 head;
+ struct zstd_data zstd_data;
+ struct decomp_data decomp_data;
};
static int
@@ -2207,6 +2210,10 @@ reader__process_events(struct reader *rd, struct perf_session *session,
memset(mmaps, 0, sizeof(rd->mmaps));
+ if (zstd_init(&rd->zstd_data, 0))
+ return -1;
+ rd->decomp_data.zstd_decomp = &rd->zstd_data;
+
mmap_prot = PROT_READ;
mmap_flags = MAP_SHARED;
@@ -2250,6 +2257,7 @@ reader__process_events(struct reader *rd, struct perf_session *session,
goto remap;
}
+ session->active_decomp = &rd->decomp_data;
size = event->header.size;
skip = -EINVAL;
@@ -2282,6 +2290,7 @@ reader__process_events(struct reader *rd, struct perf_session *session,
goto more;
out:
+ session->active_decomp = &session->decomp_data;
return err;
}
@@ -2334,6 +2343,8 @@ static int __perf_session__process_events(struct perf_session *session)
*/
ordered_events__reinit(&session->ordered_events);
auxtrace__free_events(session);
+ perf_decomp__release_events(rd.decomp_data.decomp);
+ zstd_fini(&rd.zstd_data);
session->one_mmap = false;
return err;
}
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 5d8bd14a0a39..46c854292ad6 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -20,6 +20,12 @@ struct thread;
struct auxtrace;
struct itrace_synth_opts;
+struct decomp_data {
+ struct decomp *decomp;
+ struct decomp *decomp_last;
+ struct zstd_data *zstd_decomp;
+};
+
struct perf_session {
struct perf_header header;
struct machines machines;
@@ -39,8 +45,8 @@ struct perf_session {
u64 bytes_transferred;
u64 bytes_compressed;
struct zstd_data zstd_data;
- struct decomp *decomp;
- struct decomp *decomp_last;
+ struct decomp_data decomp_data;
+ struct decomp_data *active_decomp;
};
struct decomp {
--
2.19.0
next prev parent reply other threads:[~2021-10-07 10:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 10:25 [PATCH v3 0/5] perf session: Extend reader object to allow multiple readers Alexey Bayduraev
2021-10-07 10:25 ` [PATCH v3 1/8] perf session: Move all state items to reader object Alexey Bayduraev
2021-10-07 10:25 ` Alexey Bayduraev [this message]
2021-10-07 10:25 ` [PATCH v3 3/8] perf session: Move init/release code to separate functions Alexey Bayduraev
2021-10-07 10:25 ` [PATCH v3 4/8] perf session: Move map code to separate function Alexey Bayduraev
2021-10-07 10:25 ` [PATCH v3 5/8] perf session: Move unmap code to reader__mmap Alexey Bayduraev
2021-10-07 10:25 ` [PATCH v3 6/8] perf session: Move event read code to separate function Alexey Bayduraev
2021-10-08 7:33 ` Jiri Olsa
2021-10-08 8:42 ` Bayduraev, Alexey V
2021-10-08 14:38 ` Jiri Olsa
2021-10-11 9:08 ` Bayduraev, Alexey V
2021-10-11 9:53 ` Bayduraev, Alexey V
2021-10-11 13:21 ` Jiri Olsa
2021-10-11 16:40 ` Bayduraev, Alexey V
2021-10-11 19:56 ` Jiri Olsa
2021-10-07 10:25 ` [PATCH v3 7/8] perf session: Introduce reader return codes Alexey Bayduraev
2021-10-07 10:25 ` [PATCH v3 8/8] perf session: Introduce reader EOF function 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=664203f1a6aee3ca9dd5ea3d5a92dd707ebda9a8.1633596227.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.