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 19/24] perf session: Introduce reader objects in session object
Date: Fri, 2 Jul 2021 15:32:27 +0300 [thread overview]
Message-ID: <60c0d809830bfe6fcd1f2c704685f602e1cde23d.1625227739.git.alexey.v.bayduraev@linux.intel.com> (raw)
In-Reply-To: <cover.1625227739.git.alexey.v.bayduraev@linux.intel.com>
Allow to allocate multiple reader objects, so we could load multiple
data files located in data directory at the same time.
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 | 33 +++++++++++++++++++++------------
tools/perf/util/session.h | 3 +++
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index da39ce4acb5a..cf8491bc398b 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -342,6 +342,10 @@ 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);
+ if (session->readers) {
+ zfree(&session->readers);
+ session->nr_readers = 0;
+ }
perf_session__release_decomp_events(session);
perf_env__exit(&session->header.env);
machines__exit(&session->machines);
@@ -2301,14 +2305,7 @@ static s64 process_simple(struct perf_session *session,
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,
- .process = process_simple,
- .path = session->data->file.path,
- .in_place_update = session->data->in_place_update,
- };
+ struct reader *rd;
struct ordered_events *oe = &session->ordered_events;
struct perf_tool *tool = session->tool;
struct ui_progress prog;
@@ -2316,12 +2313,24 @@ static int __perf_session__process_events(struct perf_session *session)
perf_tool__fill_defaults(tool);
- if (rd.data_size == 0)
- return -1;
+ rd = session->readers = zalloc(sizeof(struct reader));
+ if (!rd)
+ return -ENOMEM;
+
+ session->nr_readers = 1;
+
+ *rd = (struct reader) {
+ .fd = perf_data__fd(session->data),
+ .data_size = session->header.data_size,
+ .data_offset = session->header.data_offset,
+ .process = process_simple,
+ .path = session->data->file.path,
+ .in_place_update = session->data->in_place_update,
+ };
- ui_progress__init_size(&prog, rd.data_size, "Processing events...");
+ ui_progress__init_size(&prog, rd->data_size, "Processing events...");
- err = reader__process_events(&rd, session, &prog);
+ err = reader__process_events(rd, session, &prog);
if (err)
goto out_err;
/* do the final flush for ordered samples */
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 551aec427a5b..a03e028d09e8 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -19,6 +19,7 @@ struct thread;
struct auxtrace;
struct itrace_synth_opts;
+struct reader;
struct perf_session {
struct perf_header header;
@@ -41,6 +42,8 @@ struct perf_session {
struct zstd_data zstd_data;
struct decomp *decomp;
struct decomp *decomp_last;
+ struct reader *readers;
+ int nr_readers;
};
struct decomp {
--
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 ` [PATCH v9 18/24] perf session: Introduce reader_state in reader object Alexey Bayduraev
2021-07-02 12:32 ` Alexey Bayduraev [this message]
2021-07-02 12:32 ` [PATCH v9 20/24] perf session: Introduce decompressor into trace " 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=60c0d809830bfe6fcd1f2c704685f602e1cde23d.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).