From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v5 13/25] trace-cmd library: Add macro to check file state on reading
Date: Thu, 11 Nov 2021 17:11:06 +0200 [thread overview]
Message-ID: <20211111151112.86751-4-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20211111151112.86751-1-tz.stoyanov@gmail.com>
Trace file version 7 has flexible structure. It allows reading almost
any part of the file at any time, unlike the version 6 file when reading
state must be validated at each step. Added a macro to handle these
checks.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-input.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 31e5e674..0375afba 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -166,6 +166,8 @@ struct tracecmd_input {
__thread struct tracecmd_input *tracecmd_curr_thread_handle;
+#define CHECK_READ_STATE(H, S) ((H)->file_version < FILE_VERSION_SECTIONS && (H)->file_state >= (S))
+
static int read_options_type(struct tracecmd_input *handle);
void tracecmd_set_flag(struct tracecmd_input *handle, int flag)
@@ -382,7 +384,7 @@ static int read_header_files(struct tracecmd_input *handle)
char *header;
char buf[BUFSIZ];
- if (handle->file_state >= TRACECMD_FILE_HEADERS)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_HEADERS))
return 0;
if (do_read_check(handle, buf, 12))
@@ -588,7 +590,7 @@ static int read_ftrace_files(struct tracecmd_input *handle, const char *regex)
int unique;
int ret;
- if (handle->file_state >= TRACECMD_FILE_FTRACE_EVENTS)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_FTRACE_EVENTS))
return 0;
if (regex) {
@@ -661,7 +663,7 @@ static int read_event_files(struct tracecmd_input *handle, const char *regex)
int unique;
int ret;
- if (handle->file_state >= TRACECMD_FILE_ALL_EVENTS)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_ALL_EVENTS))
return 0;
if (regex) {
@@ -745,7 +747,7 @@ static int read_proc_kallsyms(struct tracecmd_input *handle)
unsigned int size;
char *buf;
- if (handle->file_state >= TRACECMD_FILE_KALLSYMS)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_KALLSYMS))
return 0;
if (read4(handle, &size) < 0)
@@ -778,7 +780,7 @@ static int read_ftrace_printk(struct tracecmd_input *handle)
unsigned int size;
char *buf;
- if (handle->file_state >= TRACECMD_FILE_PRINTK)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_PRINTK))
return 0;
if (read4(handle, &size) < 0)
@@ -826,7 +828,7 @@ static int read_cpus(struct tracecmd_input *handle)
{
unsigned int cpus;
- if (handle->file_state >= TRACECMD_FILE_CPU_COUNT)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_CPU_COUNT))
return 0;
if (read4(handle, &cpus) < 0)
@@ -2829,7 +2831,7 @@ static int read_options_type(struct tracecmd_input *handle)
{
char buf[10];
- if (handle->file_state >= TRACECMD_FILE_CPU_LATENCY)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_CPU_LATENCY))
return 0;
if (do_read_check(handle, buf, 10))
@@ -2994,7 +2996,7 @@ static int read_and_parse_cmdlines(struct tracecmd_input *handle)
unsigned long long size;
char *cmdlines;
- if (handle->file_state >= TRACECMD_FILE_CMD_LINES)
+ if (CHECK_READ_STATE(handle, TRACECMD_FILE_CMD_LINES))
return 0;
if (read_data_and_size(handle, &cmdlines, &size) < 0)
--
2.33.1
next prev parent reply other threads:[~2021-11-11 15:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 15:11 [PATCH v5 10/25] trace-cmd library: Add section header before flyrecord trace data Tzvetomir Stoyanov (VMware)
2021-11-11 15:11 ` [PATCH v5 11/25] trace-cmd library: Fit CPU latency trace data in the new trace file version 7 format Tzvetomir Stoyanov (VMware)
2021-11-11 15:11 ` [PATCH v5 12/25] trace-cmd library: Do not write CPUs with empty trace data Tzvetomir Stoyanov (VMware)
2021-11-24 19:30 ` Steven Rostedt
2021-11-24 19:32 ` Steven Rostedt
2021-11-11 15:11 ` Tzvetomir Stoyanov (VMware) [this message]
2021-11-11 15:11 ` [PATCH v5 14/25] trace-cmd library: Introduce sections in trace file reading logic Tzvetomir Stoyanov (VMware)
2021-11-24 19:36 ` Steven Rostedt
2021-11-11 15:11 ` [PATCH v5 15/25] trace-cmd library: Initialize internal sections database on file read Tzvetomir Stoyanov (VMware)
2021-11-11 15:11 ` [PATCH v5 16/25] trace-cmd library: Use sections database when reading parts of the trace file Tzvetomir Stoyanov (VMware)
2021-11-11 15:11 ` [PATCH v5 17/25] trace-cmd library: Read headers from trace file version 7 Tzvetomir Stoyanov (VMware)
2021-11-11 15:11 ` [PATCH v5 18/25] trace-cmd library: Read extended BUFFER option Tzvetomir Stoyanov (VMware)
2021-11-11 15:11 ` [PATCH v5 19/25] trace-cmd library: Handle the extended DONE option 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=20211111151112.86751-4-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).