linux-kernel.vger.kernel.org archive mirror
 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>,
	Andi Kleen <ak@linux.intel.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v1 04/15] perf session: move reader object definition to header file
Date: Mon, 12 Oct 2020 11:56:07 +0300	[thread overview]
Message-ID: <19ec2135-d2df-f263-ade8-699f1e06ad71@linux.intel.com> (raw)
In-Reply-To: <810f3a69-0004-9dff-a911-b7ff97220ae0@linux.intel.com>


Move definition of reader to session header file to be shared
among different source files. Introduce reference to active
reader object from session object.

Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
 tools/perf/util/session.c | 27 ---------------------------
 tools/perf/util/session.h | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 6f09d506b2f6..911b2dbcd0ac 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2110,33 +2110,6 @@ static int __perf_session__process_decomp_events(struct perf_session *session)
 	return 0;
 }
 
-/*
- * On 64bit we can mmap the data file in one go. No need for tiny mmap
- * slices. On 32bit we use 32MB.
- */
-#if BITS_PER_LONG == 64
-#define MMAP_SIZE ULLONG_MAX
-#define NUM_MMAPS 1
-#else
-#define MMAP_SIZE (32 * 1024 * 1024ULL)
-#define NUM_MMAPS 128
-#endif
-
-struct reader;
-
-typedef s64 (*reader_cb_t)(struct perf_session *session,
-			   union perf_event *event,
-			   u64 file_offset,
-			   const char *file_path);
-
-struct reader {
-	int		 fd;
-	const char	 *path;
-	u64		 data_size;
-	u64		 data_offset;
-	reader_cb_t	 process;
-};
-
 static int
 reader__process_events(struct reader *rd, struct perf_session *session,
 		       struct ui_progress *prog)
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 378ffc3e2809..abdb8518a81f 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -20,6 +20,30 @@ struct thread;
 struct auxtrace;
 struct itrace_synth_opts;
 
+/*
+ * On 64bit we can mmap the data file in one go. No need for tiny mmap
+ * slices. On 32bit we use 32MB.
+ */
+#if BITS_PER_LONG == 64
+#define MMAP_SIZE ULLONG_MAX
+#define NUM_MMAPS 1
+#else
+#define MMAP_SIZE (32 * 1024 * 1024ULL)
+#define NUM_MMAPS 128
+#endif
+
+typedef s64 (*reader_cb_t)(struct perf_session *session,
+			   union perf_event *event,
+			   u64 file_offset, const char *file_path);
+
+struct reader {
+	int		 fd;
+	const char	 *path;
+	u64		 data_size;
+	u64		 data_offset;
+	reader_cb_t	 process;
+};
+
 struct perf_session {
 	struct perf_header	header;
 	struct machines		machines;
@@ -41,6 +65,7 @@ struct perf_session {
 	struct zstd_data	zstd_data;
 	struct decomp		*decomp;
 	struct decomp		*decomp_last;
+	struct reader		*reader;
 };
 
 struct decomp {
-- 
2.24.1



  parent reply	other threads:[~2020-10-12  8:56 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12  8:50 [PATCH v1 00/15] Introduce threaded trace streaming for basic perf record operation Alexey Budankov
2020-10-12  8:53 ` [PATCH v1 01/15] perf session: introduce trace file path to be shown in raw trace dump Alexey Budankov
2020-10-12  8:54 ` [PATCH v1 02/15] perf report: output trace file name " Alexey Budankov
2020-10-12 16:01   ` Andi Kleen
2020-10-12 17:06     ` Alexey Budankov
2020-10-20 16:31       ` Alexey Budankov
2020-10-20 17:10         ` Alexey Budankov
2020-10-20 20:29           ` Andi Kleen
2020-10-13 19:54   ` Jiri Olsa
2020-10-13 21:23     ` Alexey Budankov
2020-10-12  8:55 ` [PATCH v1 03/15] perf data: open data directory in read access mode Alexey Budankov
2020-10-12 16:03   ` Andi Kleen
2020-10-12 16:52     ` Alexey Budankov
2020-10-13 16:22       ` Arnaldo Carvalho de Melo
2020-10-14 10:39         ` Alexey Budankov
2020-10-12  8:56 ` Alexey Budankov [this message]
2020-10-12  8:57 ` [PATCH v1 05/15] perf session: introduce decompressor into trace reader object Alexey Budankov
2020-10-12 16:05   ` Andi Kleen
2020-10-12 16:50     ` Alexey Budankov
2020-10-12  8:58 ` [PATCH v1 06/15] perf session: load data directory into tool process memory Alexey Budankov
2020-10-12 16:09   ` Andi Kleen
2020-10-12 16:49     ` Alexey Budankov
2020-10-13 11:30       ` Alexey Budankov
2020-10-21  6:54         ` Namhyung Kim
2020-10-21 10:25           ` Alexey Budankov
2020-10-21 10:57             ` Namhyung Kim
2020-10-21 13:01               ` Alexey Budankov
2020-10-12  8:59 ` [PATCH v1 07/15] perf record: introduce trace file, compressor and stats in mmap object Alexey Budankov
2020-10-12  9:01 ` [PATCH v1 08/15] perf record: write trace data into mmap trace files Alexey Budankov
2020-10-14 10:52   ` Namhyung Kim
2020-10-14 12:09     ` Alexey Budankov
2020-10-21  7:34       ` Namhyung Kim
2020-10-21 10:24         ` Alexey Budankov
2020-10-21 10:51           ` Namhyung Kim
2020-10-12  9:02 ` [PATCH v1 09/15] perf record: introduce thread specific objects for trace streaming Alexey Budankov
2020-10-12  9:03 ` [PATCH v1 10/15] perf record: manage thread specific data array Alexey Budankov
2020-10-12  9:05 ` [PATCH v1 11/15] perf evlist: introduce evlist__ctlfd_update() to update ctl fd status Alexey Budankov
2020-10-12  9:05 ` [PATCH v1 12/15] perf record: introduce thread local variable for trace streaming Alexey Budankov
2020-10-12  9:10 ` [PATCH v1 13/15] perf record: stop threads in the end of " Alexey Budankov
2020-10-12  9:11 ` [PATCH v1 14/15] perf record: start threads in the beginning " Alexey Budankov
2020-10-12  9:13 ` [PATCH v1 15/15] perf record: introduce --threads command line option Alexey Budankov
2020-10-13 16:20 ` [PATCH v1 00/15] Introduce threaded trace streaming for basic perf record operation Arnaldo Carvalho de Melo
2020-10-14 12:15   ` Alexey Budankov
2020-10-14 17:27 ` Ingo Molnar
2020-10-15 10:35   ` Alexey Budankov

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=19ec2135-d2df-f263-ade8-699f1e06ad71@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 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).