From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v2 5/7] trace-cmd library: Select the file version when writing trace file
Date: Thu, 29 Apr 2021 07:01:17 +0300 [thread overview]
Message-ID: <20210429040119.843617-6-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210429040119.843617-1-tz.stoyanov@gmail.com>
When a new output handler to trace file is allocated, select the proper
file version. If this output handler is based on an existing input trace
file handler, inherit the trace file version.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-output.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index 9231c319..f36718f1 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -57,6 +57,7 @@ struct tracecmd_output {
int nr_options;
bool quiet;
unsigned long file_state;
+ unsigned long file_version;
struct list_head options;
struct tracecmd_msg_handle *msg_handle;
char *trace_clock;
@@ -907,6 +908,17 @@ out_free:
return ret;
}
+static int select_file_version(struct tracecmd_output *handle,
+ struct tracecmd_input *ihandle)
+{
+ if (ihandle)
+ handle->file_version = tracecmd_get_file_version(ihandle);
+ else
+ handle->file_version = FILE_VERSION;
+
+ return 0;
+}
+
static struct tracecmd_output *
create_file_fd(int fd, struct tracecmd_input *ihandle,
const char *tracing_dir,
@@ -933,6 +945,9 @@ create_file_fd(int fd, struct tracecmd_input *ihandle,
handle->msg_handle = msg_handle;
+ if (select_file_version(handle, ihandle))
+ goto out_free;
+
list_head_init(&handle->options);
buf[0] = 23;
@@ -943,7 +958,8 @@ create_file_fd(int fd, struct tracecmd_input *ihandle,
if (do_write_check(handle, buf, 10))
goto out_free;
- if (do_write_check(handle, FILE_VERSION_STRING, strlen(FILE_VERSION_STRING) + 1))
+ sprintf(buf, "%lu", handle->file_version);
+ if (do_write_check(handle, buf, strlen(buf) + 1))
goto out_free;
/* get endian and page size */
@@ -1602,6 +1618,7 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd)
handle->pevent = tracecmd_get_tep(ihandle);
tep_ref(handle->pevent);
handle->page_size = tracecmd_page_size(ihandle);
+ handle->file_version = tracecmd_get_file_version(ihandle);
list_head_init(&handle->options);
tracecmd_close(ihandle);
--
2.30.2
next prev parent reply other threads:[~2021-04-29 4:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 4:01 [PATCH v2 0/7] Bump trace file version Tzvetomir Stoyanov (VMware)
2021-04-29 4:01 ` [PATCH v2 1/7] trace-cmd library: Remove unused private APIs for creating trace files Tzvetomir Stoyanov (VMware)
2021-04-29 4:01 ` [PATCH v2 2/7] trace-cmd: Check if file version is supported Tzvetomir Stoyanov (VMware)
2021-04-29 4:01 ` [PATCH v2 3/7] trace-cmd library: Bump the trace file version to 7 Tzvetomir Stoyanov (VMware)
2021-04-29 4:01 ` [PATCH v2 4/7] trace-cmd library: Add new API to get file version of input handler Tzvetomir Stoyanov (VMware)
2021-04-29 4:01 ` Tzvetomir Stoyanov (VMware) [this message]
2021-04-29 13:42 ` [PATCH v2 5/7] trace-cmd library: Select the file version when writing trace file Steven Rostedt
2021-04-29 4:01 ` [PATCH v2 6/7] trace-cmd library: Extend the create file APIs to support different file version Tzvetomir Stoyanov (VMware)
2021-04-29 13:50 ` Steven Rostedt
2021-04-29 4:01 ` [PATCH v2 7/7] trace-cmd record: Add new parameter --file-version Tzvetomir Stoyanov (VMware)
2021-04-29 13:54 ` Steven Rostedt
2021-05-10 6:22 ` [PATCH v2 0/7] Bump trace file version Tzvetomir Stoyanov
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=20210429040119.843617-6-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).