From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v3 17/25] trace-cmd library: Read headers from trace file version 7
Date: Tue, 14 Sep 2021 16:14:30 +0300 [thread overview]
Message-ID: <20210914131438.3965484-18-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210914131438.3965484-1-tz.stoyanov@gmail.com>
Trace file version 7 has more flexible structure than version 6, headers
are not located at fixed position in the file. A new logic is
implemented to read and parse the headers from this new format.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-input.c | 145 ++++++++++++++++++++++++++++++++----
1 file changed, 130 insertions(+), 15 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 785a1b93..686655bd 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -162,8 +162,7 @@ struct tracecmd_input {
struct pid_addr_maps *pid_maps;
/* file information */
struct file_section *sections;
- size_t header_files_start;
- size_t ftrace_files_start;
+ bool options_init;
unsigned long long options_start;
size_t total_file_size;
@@ -924,19 +923,7 @@ static int read_cpus(struct tracecmd_input *handle)
return 0;
}
-/**
- * tracecmd_read_headers - read the header information from trace.dat
- * @handle: input handle for the trace.dat file
- * @state: The state to read up to or zero to read up to options.
- *
- * This reads the trace.dat file for various information. Like the
- * format of the ring buffer, event formats, ftrace formats, kallsyms
- * and printk. This may be called multiple times with different @state
- * values, to read partial data at a time. It will always continue
- * where it left off.
- */
-int tracecmd_read_headers(struct tracecmd_input *handle,
- enum tracecmd_file_states state)
+static int read_headers_v6(struct tracecmd_input *handle, enum tracecmd_file_states state)
{
int ret;
@@ -1002,6 +989,134 @@ int tracecmd_read_headers(struct tracecmd_input *handle,
return 0;
}
+static int handle_options(struct tracecmd_input *handle);
+
+static int read_section_header(struct tracecmd_input *handle, unsigned short *id,
+ unsigned short *flags, unsigned int *size, char **description)
+{
+ unsigned short fl;
+ char *desc = NULL;
+ unsigned short sec_id;
+ unsigned int sz;
+
+ if (read2(handle, &sec_id))
+ return -1;
+ desc = read_string(handle);
+ if (!desc)
+ return -1;
+ if (read2(handle, &fl))
+ goto error;
+ if (read4(handle, &sz))
+ goto error;
+
+ if (id)
+ *id = sec_id;
+ if (flags)
+ *flags = fl;
+ if (size)
+ *size = sz;
+ if (description)
+ *description = desc;
+ else
+ free(desc);
+ return 0;
+
+error:
+ free(desc);
+ return -1;
+}
+
+static int handle_section(struct tracecmd_input *handle, struct file_section *section)
+{
+ unsigned short id, flags;
+ unsigned int size;
+ int ret;
+
+ if (lseek64(handle->fd, section->section_offset, SEEK_SET) == (off_t)-1)
+ return -1;
+ if (read_section_header(handle, &id, &flags, &size, NULL))
+ return -1;
+ section->flags = flags;
+ if (id != section->id)
+ return -1;
+
+ section->data_offset = lseek64(handle->fd, 0, SEEK_CUR);
+
+ switch (section->id) {
+ case TRACECMD_OPTION_HEADER_INFO:
+ ret = read_header_files(handle);
+ break;
+ case TRACECMD_OPTION_FTRACE_EVENTS:
+ ret = read_ftrace_files(handle, NULL);
+ break;
+ case TRACECMD_OPTION_EVENT_FORMATS:
+ ret = read_event_files(handle, NULL);
+ break;
+ case TRACECMD_OPTION_KALLSYMS:
+ ret = read_proc_kallsyms(handle);
+ break;
+ case TRACECMD_OPTION_PRINTK:
+ ret = read_ftrace_printk(handle);
+ break;
+ case TRACECMD_OPTION_CMDLINES:
+ ret = read_and_parse_cmdlines(handle);
+ break;
+ default:
+ ret = 0;
+ break;
+ }
+
+ return ret;
+}
+
+static int read_headers_v7(struct tracecmd_input *handle)
+{
+ struct file_section *section;
+
+ if (handle->options_init)
+ return 0;
+
+ if (!handle->options_start)
+ return -1;
+
+ if (lseek64(handle->fd, handle->options_start, SEEK_SET) == (off64_t)-1) {
+ tracecmd_warning("Filed to goto options offset %lld", handle->options_start);
+ return -1;
+ }
+
+ if (handle_options(handle))
+ return -1;
+
+ section = handle->sections;
+ while (section) {
+ if (handle_section(handle, section))
+ return -1;
+ section = section->next;
+ }
+
+ handle->options_init = true;
+ return 0;
+}
+
+/**
+ * tracecmd_read_headers - read the header information from trace.dat
+ * @handle: input handle for the trace.dat file
+ * @state: The state to read up to or zero to read up to options.
+ *
+ * This reads the trace.dat file for various information. Like the
+ * format of the ring buffer, event formats, ftrace formats, kallsyms
+ * and printk. This may be called multiple times with different @state
+ * values, to read partial data at a time. It will always continue
+ * where it left off.
+ */
+int tracecmd_read_headers(struct tracecmd_input *handle,
+ enum tracecmd_file_states state)
+{
+ if (!HAS_SECTIONS(handle))
+ return read_headers_v6(handle, state);
+ return read_headers_v7(handle);
+}
+
static unsigned long long calc_page_offset(struct tracecmd_input *handle,
unsigned long long offset)
{
--
2.31.1
next prev parent reply other threads:[~2021-09-14 13:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 13:14 [PATCH v3 00/25] Trace file version 7 - sections Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 01/25] trace-cmd library: Define trace file version 7 Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 02/25] trace-cmd library: Add cache functionality to network message handler Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 03/25] trace-cmd library: New APIs to get and set version of output handler Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 04/25] trace-cmd library: Add internal helper function for writing headers before file sections Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 05/25] trace-cmd library: Write header " Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 06/25] trace-cmd library: Add multiple options sections in trace file version 7 Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 07/25] trace-cmd library: Do not write CPU count section in trace files " Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 08/25] trace-cmd library: Move CPU flyrecord trace metadata into the buffer option, for trace file " Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 09/25] trace-cmd record: Append trace options after the trace data are written Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 10/25] trace-cmd library: Add section header before flyrecord trace data Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 11/25] trace-cmd library: Fit CPU latency trace data in the new trace file version 7 format Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 12/25] trace-cmd library: Do not write CPUs with empty trace data Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 13/25] trace-cmd library: Add macro to check file state on reading Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 14/25] trace-cmd library: Introduce sections in trace file reading logic Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 15/25] trace-cmd library: Initialize internal sections database on file read Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 16/25] trace-cmd library: Use sections database when reading parts of the trace file Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` Tzvetomir Stoyanov (VMware) [this message]
2021-09-14 13:14 ` [PATCH v3 18/25] trace-cmd library: Read extended BUFFER option Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 19/25] trace-cmd library: Handle the extended DONE option Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 20/25] trace-cmd library: Initialize CPU data for reading from version 7 trace files Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 21/25] trace-cmd library: Handle latency trace in version 7 files Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 22/25] trace-cmd library: Handle buffer trace data init for " Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 23/25] trace-cmd report: Use the new latency API to read data Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 24/25] trace-cmd: Call additional APIs when creating trace file Tzvetomir Stoyanov (VMware)
2021-09-14 13:14 ` [PATCH v3 25/25] trace-cmd report: Add new parameter for trace file version Tzvetomir Stoyanov (VMware)
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=20210914131438.3965484-18-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.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).