* [PATCH v5 09/25] trace-cmd record: Append trace options after the trace data are written
@ 2021-11-11 15:09 Tzvetomir Stoyanov (VMware)
2021-11-24 19:27 ` Steven Rostedt
0 siblings, 1 reply; 2+ messages in thread
From: Tzvetomir Stoyanov (VMware) @ 2021-11-11 15:09 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
In trace file version 7, the CPU trace metadata is saved in a trace
option. As this metadata has file offsets, which depend on the CPU trace
data, the option must be written in the file after the CPU trace data.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
tracecmd/trace-record.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 757dab0f..32270e20 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4449,6 +4449,9 @@ static void write_guest_file(struct buffer_instance *instance)
if (tracecmd_write_cpu_data(handle, cpu_count, temp_files, NULL) < 0)
die("failed to write CPU data");
+ if (tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS)
+ tracecmd_write_options(handle);
+
tracecmd_output_close(handle);
for (i = 0; i < cpu_count; i++)
@@ -4597,7 +4600,8 @@ static void record_data(struct common_record_context *ctx)
append_buffer(handle, instance, temp_files);
}
}
-
+ if (tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS)
+ tracecmd_write_options(handle);
free(temp_files);
}
if (!handle)
--
2.33.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v5 09/25] trace-cmd record: Append trace options after the trace data are written
2021-11-11 15:09 [PATCH v5 09/25] trace-cmd record: Append trace options after the trace data are written Tzvetomir Stoyanov (VMware)
@ 2021-11-24 19:27 ` Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2021-11-24 19:27 UTC (permalink / raw)
To: Tzvetomir Stoyanov (VMware); +Cc: linux-trace-devel
On Thu, 11 Nov 2021 17:09:33 +0200
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote:
> In trace file version 7, the CPU trace metadata is saved in a trace
> option. As this metadata has file offsets, which depend on the CPU trace
> data, the option must be written in the file after the CPU trace data.
>
> Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
> ---
> tracecmd/trace-record.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
> index 757dab0f..32270e20 100644
> --- a/tracecmd/trace-record.c
> +++ b/tracecmd/trace-record.c
> @@ -4449,6 +4449,9 @@ static void write_guest_file(struct buffer_instance *instance)
>
> if (tracecmd_write_cpu_data(handle, cpu_count, temp_files, NULL) < 0)
> die("failed to write CPU data");
> + if (tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS)
Can't this be detected on close?
That is, if the handle has pending options to write out, and the handle has
sections, can't the tracecmd_output_close() write it out then?
Why make this something the user must worry about?
-- Steve
> + tracecmd_write_options(handle);
> +
> tracecmd_output_close(handle);
>
> for (i = 0; i < cpu_count; i++)
> @@ -4597,7 +4600,8 @@ static void record_data(struct common_record_context *ctx)
> append_buffer(handle, instance, temp_files);
> }
> }
> -
> + if (tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS)
> + tracecmd_write_options(handle);
> free(temp_files);
> }
> if (!handle)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-24 19:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-11 15:09 [PATCH v5 09/25] trace-cmd record: Append trace options after the trace data are written Tzvetomir Stoyanov (VMware)
2021-11-24 19:27 ` Steven Rostedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.