From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH 16/25] trace-cmd library: Use sections database when reading parts of the trace file
Date: Fri, 10 Sep 2021 16:50:52 +0300 [thread overview]
Message-ID: <20210910135101.2865226-17-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210910135101.2865226-1-tz.stoyanov@gmail.com>
Utilize the internal database with file sections, when reading parts
of a trace file. This logic unifies the way trace file version 6 and 7
are processed.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-input.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index d6aa7c8e..6eabd04e 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -3285,21 +3285,26 @@ int tracecmd_make_pipe(struct tracecmd_input *handle, int cpu, int fd, int cpus)
*/
void tracecmd_print_events(struct tracecmd_input *handle, const char *regex)
{
- int ret;
+ struct file_section *sec;
if (!regex)
regex = ".*";
- if (!handle->ftrace_files_start) {
- lseek64(handle->fd, handle->header_files_start, SEEK_SET);
+ sec = section_open(handle, TRACECMD_OPTION_HEADER_INFO);
+ if (sec) {
read_header_files(handle);
+ section_close(handle, sec);
+ }
+ sec = section_open(handle, TRACECMD_OPTION_FTRACE_EVENTS);
+ if (sec) {
+ read_ftrace_files(handle, regex);
+ section_close(handle, sec);
+ }
+ sec = section_open(handle, TRACECMD_OPTION_EVENT_FORMATS);
+ if (sec) {
+ read_event_files(handle, regex);
+ section_close(handle, sec);
}
- ret = read_ftrace_files(handle, regex);
- if (ret < 0)
- return;
-
- read_event_files(handle, regex);
- return;
}
/* Show the cpu data stats */
@@ -3903,6 +3908,7 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd,
enum tracecmd_file_states start_state,
enum tracecmd_file_states end_state)
{
+ struct file_section *sec;
int ret;
if (!start_state)
@@ -3918,13 +3924,17 @@ int tracecmd_copy_headers(struct tracecmd_input *handle, int fd,
if (handle->file_state >= start_state) {
/* Set the handle to just before the start state */
- lseek64(handle->fd, handle->header_files_start, SEEK_SET);
+ sec = section_open(handle, TRACECMD_OPTION_HEADER_INFO);
+ if (!sec)
+ return -1;
/* Now that the file handle has moved, change its state */
handle->file_state = TRACECMD_FILE_INIT;
}
/* Try to bring the input up to the start state - 1 */
ret = tracecmd_read_headers(handle, start_state - 1);
+ if (sec)
+ section_close(handle, sec);
if (ret < 0)
goto out;
--
2.31.1
next prev parent reply other threads:[~2021-09-10 13:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-10 13:50 [PATCH 00/25] Trace file version 7 - sections Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 01/25] trace-cmd library: Define trace file version 7 Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 02/25] trace-cmd library: Add cache functionality to network message handler Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 03/25] trace-cmd library: New APIs to get and set version of output handler Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 04/25] trace-cmd library: Add internal helper function for writing headers before file sections Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 05/25] trace-cmd library: Write header " Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 06/25] trace-cmd library: Add multiple options sections in trace file version 7 Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 07/25] trace-cmd library: Do not write CPU count section in trace files " Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 08/25] trace-cmd library: Move CPU flyrecord trace metadata into the buffer option, for trace file " Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 09/25] trace-cmd record: Append trace options after the trace data are written Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 10/25] trace-cmd library: Add section header before flyrecord trace data Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 11/25] trace-cmd library: Fit CPU latency trace data in the new trace file version 7 format Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 12/25] trace-cmd library: Do not write CPUs with empty trace data Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 13/25] trace-cmd library: Add macro to check file state on reading Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 14/25] trace-cmd library: Introduce sections in trace file reading logic Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 15/25] trace-cmd library: Initialize internal sections database on file read Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` Tzvetomir Stoyanov (VMware) [this message]
2021-09-10 13:50 ` [PATCH 17/25] trace-cmd library: Read headers from trace file version 7 Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 18/25] trace-cmd library: Read extended BUFFER option Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 19/25] trace-cmd library: Handle the extended DONE option Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 20/25] trace-cmd library: Initialize CPU data for reading from version 7 trace files Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 21/25] trace-cmd library: Handle latency trace in version 7 files Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 22/25] trace-cmd library: Handle buffer trace data init for " Tzvetomir Stoyanov (VMware)
2021-09-10 13:50 ` [PATCH 23/25] trace-cmd report: Use the new latency API to read data Tzvetomir Stoyanov (VMware)
2021-09-10 13:51 ` [PATCH 24/25] trace-cmd: Call additional APIs when creating trace file Tzvetomir Stoyanov (VMware)
2021-09-10 13:51 ` [PATCH 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=20210910135101.2865226-17-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).