All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexey Budankov <alexey.budankov@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Andi Kleen <ak@linux.intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 06/15] perf session: load data directory into tool process memory
Date: Wed, 21 Oct 2020 19:01:19 +0300	[thread overview]
Message-ID: <d28243e3-3178-d7cd-7b96-7ed63fd83493@linux.intel.com> (raw)
In-Reply-To: <1ec29ed6-0047-d22f-630b-a7f5ccee96b4@linux.intel.com>


Read trace files located in data directory into tool process memory.
Basic analysis support of data directories is provided for report
mode. Raw dump (-D) and aggregated reports are available for data
directories, still with no memory consumption optimizations. However
data directories collected with --compression-level option enabled
can be analyzed with little less memory because trace files are
unmaped from tool process memory after loading collected data.
The implementation is 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>
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
 tools/perf/util/session.c | 48 +++++++++++++++++++++++++++++++++++++++
 tools/perf/util/session.h |  1 +
 2 files changed, 49 insertions(+)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 6afc670fdf0c..0752eec19813 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2212,6 +2212,17 @@ reader__process_events(struct reader *rd, struct perf_session *session,
 		goto more;
 
 out:
+	if (rd->unmap_file) {
+		int i;
+
+		for (i = 0; i < NUM_MMAPS; i++) {
+			if (mmaps[i]) {
+				munmap(mmaps[i], mmap_size);
+				mmaps[i] = NULL;
+			}
+		}
+	}
+
 	return err;
 }
 
@@ -2231,6 +2242,7 @@ static int __perf_session__process_events(struct perf_session *session)
 		.data_offset	= session->header.data_offset,
 		.process	= process_simple,
 		.path		= session->data->file.path,
+		.unmap_file	= false,
 	};
 	struct ordered_events *oe = &session->ordered_events;
 	struct perf_tool *tool = session->tool;
@@ -2247,6 +2259,42 @@ static int __perf_session__process_events(struct perf_session *session)
 	err = reader__process_events(&rd, session, &prog);
 	if (err)
 		goto out_err;
+
+	if (perf_data__is_dir(session->data)) {
+		int i, nr = session->data->dir.nr;
+		struct reader file_rd[nr];
+		u64 total_size = perf_data__size(session->data);
+
+		total_size -= session->data->file.size;
+		ui_progress__init_size(&prog, total_size, "Sorting events...");
+
+		memset(&file_rd, 0, nr * sizeof(file_rd[0]));
+
+		for (i = 0; i < nr ; i++) {
+			struct perf_data_file *file;
+
+			file = &session->data->dir.files[i];
+			file_rd[i] = (struct reader) {
+				.fd             = file->fd,
+				.path           = file->path,
+				.data_size      = file->size,
+				.data_offset    = 0,
+				.process	= process_simple,
+			};
+			file_rd[i].unmap_file = perf_header__has_feat(&session->header,
+								      HEADER_COMPRESSED);
+			session->reader = &file_rd[i];
+
+			if (zstd_init(&(file_rd[i].zstd_data), 0))
+				goto out_err;
+			err = reader__process_events(&file_rd[i], session, &prog);
+			zstd_fini(&(file_rd[i].zstd_data));
+			session->reader = NULL;
+			if (err)
+				goto out_err;
+		}
+	}
+
 	/* do the final flush for ordered samples */
 	err = ordered_events__flush(oe, OE_FLUSH__FINAL);
 	if (err)
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 4fc9ccdf7970..d428f3eaf7fd 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -43,6 +43,7 @@ struct reader {
 	u64		 data_offset;
 	reader_cb_t	 process;
 	struct zstd_data zstd_data;
+	bool		 unmap_file;
 };
 
 struct perf_session {
-- 
2.24.1


  parent reply	other threads:[~2020-10-21 16:01 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-21 15:52 [PATCH v2 00/15] Introduce threaded trace streaming for basic perf record operation Alexey Budankov
2020-10-21 15:56 ` [PATCH v2 01/15] perf session: introduce trace file path to be shown in raw trace dump Alexey Budankov
2020-10-22  4:28   ` Namhyung Kim
2020-10-21 15:57 ` [PATCH v2 02/15] perf report: output trace file name " Alexey Budankov
2020-10-22  4:29   ` Namhyung Kim
2020-10-21 15:57 ` [PATCH v2 03/15] perf data: open data directory in read access mode Alexey Budankov
2020-10-22  4:31   ` Namhyung Kim
2020-10-22  7:50     ` Alexey Budankov
2020-10-24 15:43   ` Jiri Olsa
2020-10-26 17:47     ` Alexey Budankov
2020-10-27 11:59       ` Jiri Olsa
2020-10-27 14:44         ` Alexey Budankov
2020-10-21 15:59 ` [PATCH v2 04/15] perf session: move reader object definition to header file Alexey Budankov
2020-10-22  4:31   ` Namhyung Kim
2020-10-24 15:44   ` Jiri Olsa
2020-10-26 17:50     ` Alexey Budankov
2020-10-21 16:00 ` [PATCH v2 05/15] perf session: introduce decompressor into trace reader object Alexey Budankov
2020-10-22  4:36   ` Namhyung Kim
2020-10-22  7:20     ` Alexey Budankov
2020-10-24 15:44   ` Jiri Olsa
2020-10-26  8:54     ` Alexei Budankov
2020-10-21 16:01 ` Alexey Budankov [this message]
2020-10-24 15:43   ` [PATCH v2 06/15] perf session: load data directory into tool process memory Jiri Olsa
2020-10-27  7:37     ` Alexey Budankov
2020-10-27 12:21       ` Jiri Olsa
2020-10-27 14:43         ` Alexey Budankov
2020-10-28  7:22           ` Namhyung Kim
2020-10-28 15:39             ` Jiri Olsa
2020-10-29 11:00               ` Namhyung Kim
2020-10-28 15:36           ` Jiri Olsa
2020-10-27 15:04         ` Alexey Budankov
2020-10-21 16:01 ` [PATCH v2 07/15] perf record: introduce trace file, compressor and stats in mmap object Alexey Budankov
2020-10-21 16:02 ` [PATCH v2 08/15] perf record: write trace data into mmap trace files Alexey Budankov
2020-10-24 15:44   ` Jiri Olsa
2020-10-26  8:52     ` Alexei Budankov
2020-10-26 10:32       ` Jiri Olsa
2020-10-26 14:04         ` Alexei Budankov
2020-10-21 16:03 ` [PATCH v2 09/15] perf record: introduce thread specific objects for trace streaming Alexey Budankov
2020-10-24 15:44   ` Jiri Olsa
2020-10-26  8:53     ` Alexei Budankov
2020-10-21 16:04 ` [PATCH v2 10/15] perf record: manage thread specific data array Alexey Budankov
2020-10-24 15:44   ` Jiri Olsa
2020-10-26  8:39     ` Alexei Budankov
2020-10-21 16:06 ` [PATCH v2 11/15] perf evlist: introduce evlist__ctlfd_update() to update ctl fd status Alexey Budankov
2020-10-21 16:07 ` [PATCH v2 12/15] perf record: introduce thread local variable for trace streaming Alexey Budankov
2020-10-24 15:43   ` Jiri Olsa
2020-10-26  8:21     ` Alexei Budankov
2020-10-26 10:34       ` Jiri Olsa
2020-10-26 14:11         ` Alexei Budankov
2020-10-27 12:01           ` Jiri Olsa
2020-10-27 14:16             ` Alexey Budankov
2020-10-27 15:58             ` Alexey Budankov
2020-10-21 16:08 ` [PATCH v2 13/15] perf record: stop threads in the end of " Alexey Budankov
2020-10-21 16:10 ` [PATCH v2 14/15] perf record: start threads in the beginning " Alexey Budankov
2020-10-24 15:44   ` Jiri Olsa
2020-10-26  8:39     ` Alexei Budankov
2020-10-21 16:10 ` [PATCH v2 15/15] perf record: introduce --threads command line option Alexey Budankov
2020-10-24 15:43 ` [PATCH v2 00/15] Introduce threaded trace streaming for basic perf record operation Jiri Olsa
2020-10-26 17:59   ` Alexey Budankov
2020-10-27 12:10     ` Jiri Olsa
2020-10-27 14:26       ` Alexey Budankov
2020-10-27 16:01       ` Alexey Budankov
2020-10-28  7:08         ` Namhyung Kim
     [not found]           ` <b6150d2f-04a6-9204-59ac-c31c8697c630@linux.intel.com>
2020-10-28 15:32             ` Jiri Olsa

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=d28243e3-3178-d7cd-7b96-7ed63fd83493@linux.intel.com \
    --to=alexey.budankov@linux.intel.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@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 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.