From: "Bayduraev, Alexey V" <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>,
Alexei Budankov <abudankov@huawei.com>,
Alexander Antonov <alexander.antonov@linux.intel.com>
Subject: [PATCH v4 07/12] perf record: init data file at mmap buffer object
Date: Tue, 6 Apr 2021 11:48:00 +0300 [thread overview]
Message-ID: <05b01d0b-0308-0e60-f3ec-08ae62614e4f@linux.intel.com> (raw)
In-Reply-To: <6c15adcb-6a9d-320e-70b5-957c4c8b6ff2@linux.intel.com>
Initialize data files located at mmap buffer objects so trace data
can be written into several data file located at data directory.
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
---
tools/perf/builtin-record.c | 41 ++++++++++++++++++++++++++++++-------
tools/perf/util/record.h | 1 +
2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 3947c60d905b..c1416d28ac6d 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -158,6 +158,11 @@ static const char *affinity_tags[PERF_AFFINITY_MAX] = {
"SYS", "NODE", "CPU"
};
+static int record__threads_enabled(struct record *rec)
+{
+ return rec->opts.threads_spec;
+}
+
static bool switch_output_signal(struct record *rec)
{
return rec->switch_output.signal &&
@@ -1066,7 +1071,7 @@ static void record__free_thread_data(struct record *rec)
static int record__mmap_evlist(struct record *rec,
struct evlist *evlist)
{
- int ret;
+ int i, ret;
struct record_opts *opts = &rec->opts;
bool auxtrace_overwrite = opts->auxtrace_snapshot_mode ||
opts->auxtrace_sample_mode;
@@ -1105,6 +1110,18 @@ static int record__mmap_evlist(struct record *rec,
if (ret)
return ret;
+ if (record__threads_enabled(rec)) {
+ ret = perf_data__create_dir(&rec->data, evlist->core.nr_mmaps);
+ if (ret)
+ return ret;
+ for (i = 0; i < evlist->core.nr_mmaps; i++) {
+ if (evlist->mmap)
+ evlist->mmap[i].file = &rec->data.dir.files[i];
+ if (evlist->overwrite_mmap)
+ evlist->overwrite_mmap[i].file = &rec->data.dir.files[i];
+ }
+ }
+
return 0;
}
@@ -1405,8 +1422,12 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
/*
* Mark the round finished in case we wrote
* at least one event.
+ *
+ * No need for round events in directory mode,
+ * because per-cpu maps and files have data
+ * sorted by kernel.
*/
- if (bytes_written != rec->bytes_written)
+ if (!record__threads_enabled(rec) && bytes_written != rec->bytes_written)
rc = record__write(rec, NULL, &finished_round_event, sizeof(finished_round_event));
if (overwrite)
@@ -1519,7 +1540,9 @@ static void record__init_features(struct record *rec)
if (!rec->opts.use_clockid)
perf_header__clear_feat(&session->header, HEADER_CLOCK_DATA);
- perf_header__clear_feat(&session->header, HEADER_DIR_FORMAT);
+ if (!record__threads_enabled(rec))
+ perf_header__clear_feat(&session->header, HEADER_DIR_FORMAT);
+
if (!record__comp_enabled(rec))
perf_header__clear_feat(&session->header, HEADER_COMPRESSED);
@@ -1530,15 +1553,21 @@ static void
record__finish_output(struct record *rec)
{
struct perf_data *data = &rec->data;
- int fd = perf_data__fd(data);
+ int i, fd = perf_data__fd(data);
if (data->is_pipe)
return;
rec->session->header.data_size += rec->bytes_written;
data->file.size = lseek(perf_data__fd(data), 0, SEEK_CUR);
+ if (record__threads_enabled(rec)) {
+ for (i = 0; i < data->dir.nr; i++)
+ data->dir.files[i].size = lseek(data->dir.files[i].fd, 0, SEEK_CUR);
+ }
if (!rec->no_buildid) {
+ /* this will be recalculated during process_buildids() */
+ rec->samples = 0;
process_buildids(rec);
if (rec->buildid_all)
@@ -2438,8 +2467,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
status = err;
record__synthesize(rec, true);
- /* this will be recalculated during process_buildids() */
- rec->samples = 0;
if (!err) {
if (!rec->timestamp_filename) {
@@ -3203,7 +3230,7 @@ int cmd_record(int argc, const char **argv)
rec->no_buildid = true;
}
- if (rec->opts.kcore)
+ if (rec->opts.kcore || record__threads_enabled(rec))
rec->data.is_dir = true;
if (rec->opts.comp_level != 0) {
diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h
index 68f471d9a88b..4d68b7e27272 100644
--- a/tools/perf/util/record.h
+++ b/tools/perf/util/record.h
@@ -77,6 +77,7 @@ struct record_opts {
int ctl_fd;
int ctl_fd_ack;
bool ctl_fd_close;
+ int threads_spec;
};
extern const char * const *record_usage;
--
2.19.0
next prev parent reply other threads:[~2021-04-06 8:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 8:37 [PATCH v4 00/12] Introduce threaded trace streaming for basic perf record operation Bayduraev, Alexey V
2021-04-06 8:38 ` [PATCH v4 01/12] perf record: introduce thread affinity and mmap masks Bayduraev, Alexey V
2021-04-06 8:39 ` [PATCH v4 02/12] perf record: introduce thread specific data array Bayduraev, Alexey V
2021-04-08 14:16 ` Andi Kleen
2021-04-09 7:06 ` Bayduraev, Alexey V
2021-04-06 8:40 ` [PATCH v4 03/12] perf record: introduce thread local variable Bayduraev, Alexey V
2021-04-06 8:44 ` [PATCH v4 04/12] perf record: stop threads in the end of trace streaming Bayduraev, Alexey V
2021-04-06 8:45 ` [PATCH v4 05/12] perf record: start threads in the beginning " Bayduraev, Alexey V
2021-04-08 14:21 ` Andi Kleen
2021-04-06 8:47 ` [PATCH v4 06/12] perf record: introduce data file at mmap buffer object Bayduraev, Alexey V
2021-04-08 21:52 ` Jiri Olsa
2021-04-06 8:48 ` Bayduraev, Alexey V [this message]
2021-04-06 8:49 ` [PATCH v4 08/12] perf record: introduce --threads=<spec> command line option Bayduraev, Alexey V
2021-04-08 21:52 ` Jiri Olsa
2021-04-13 1:02 ` Namhyung Kim
2021-04-06 8:49 ` [PATCH v4 09/12] perf record: document parallel data streaming mode Bayduraev, Alexey V
2021-04-08 14:25 ` Andi Kleen
2021-04-06 8:51 ` [PATCH v4 10/12] perf report: output data file name in raw trace dump Bayduraev, Alexey V
2021-04-06 8:52 ` [PATCH v4 11/12] perf session: load data directory files for analysis Bayduraev, Alexey V
2021-04-08 21:52 ` Jiri Olsa
2021-04-06 8:53 ` [PATCH v4 12/12] perf session: use reader functions to load perf data file Bayduraev, Alexey V
2021-04-08 14:26 ` Andi Kleen
2021-04-08 21:52 ` [PATCH v4 00/12] Introduce threaded trace streaming for basic perf record operation Jiri Olsa
2021-04-09 10:51 ` Bayduraev, Alexey V
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=05b01d0b-0308-0e60-f3ec-08ae62614e4f@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).