| Message ID | 20211111151133.86788-5-tz.stoyanov@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Trace file version 7 - sections | expand |
On Thu, 11 Nov 2021 17:11:32 +0200 "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > diff --git a/tracecmd/trace-restore.c b/tracecmd/trace-restore.c > index 8d2fcae8..a903c21a 100644 > --- a/tracecmd/trace-restore.c > +++ b/tracecmd/trace-restore.c > @@ -163,6 +163,7 @@ void trace_restore (int argc, char **argv) > > if (tracecmd_append_cpu_data(handle, args, &argv[first_arg]) < 0) > die("failed to append data"); > - > + if (tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS) > + tracecmd_write_options(handle); I wonder if we are just missing a tracecmd_output_close() here? And that will write the options as I mentioned before. > return; > } > diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c > index e4a0c3b3..671d6e9f 100644 > --- a/tracecmd/trace-split.c > +++ b/tracecmd/trace-split.c > @@ -391,6 +391,9 @@ static double parse_file(struct tracecmd_input *handle, > if (tracecmd_append_cpu_data(ohandle, cpus, cpu_list) < 0) > die("Failed to append tracing data\n"); > > + if (tracecmd_get_out_file_version(ohandle) >= FILE_VERSION_SECTIONS) > + tracecmd_write_options(ohandle); > + And no more is written here to ohandle, and the close should fix it as well. -- Steve > current = end; > for (cpu = 0; cpu < cpus; cpu++) { > /* Set the tracecmd cursor to the next set of records */
diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c index 45ba1211..28be6e7b 100644 --- a/tracecmd/trace-listen.c +++ b/tracecmd/trace-listen.c @@ -604,6 +604,9 @@ static int put_together_file(int cpus, int ofd, const char *node, if (write_options) { ret = tracecmd_write_cpus(handle, cpus); + if (ret) + goto out; + ret = tracecmd_write_buffer_info(handle); if (ret) goto out; ret = tracecmd_write_options(handle); @@ -612,6 +615,9 @@ static int put_together_file(int cpus, int ofd, const char *node, } ret = tracecmd_write_cpu_data(handle, cpus, temp_files, NULL); + if (!ret && tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS) + tracecmd_write_options(handle); + out: tracecmd_output_close(handle); for (cpu--; cpu >= 0; cpu--) { diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index 0b1dc508..338a6a8a 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3729,6 +3729,9 @@ setup_connection(struct buffer_instance *instance, struct common_record_context if (ret) goto error; ret = tracecmd_write_cpus(network_handle, instance->cpu_count); + if (ret) + goto error; + ret = tracecmd_write_buffer_info(network_handle); if (ret) goto error; ret = tracecmd_write_options(network_handle); @@ -4092,6 +4095,7 @@ static void setup_agent(struct buffer_instance *instance, add_options(network_handle, ctx); tracecmd_write_cmdlines(network_handle); tracecmd_write_cpus(network_handle, instance->cpu_count); + tracecmd_write_buffer_info(network_handle); tracecmd_write_options(network_handle); tracecmd_msg_finish_sending_data(instance->msg_handle); instance->network_handle = network_handle; diff --git a/tracecmd/trace-restore.c b/tracecmd/trace-restore.c index 8d2fcae8..a903c21a 100644 --- a/tracecmd/trace-restore.c +++ b/tracecmd/trace-restore.c @@ -163,6 +163,7 @@ void trace_restore (int argc, char **argv) if (tracecmd_append_cpu_data(handle, args, &argv[first_arg]) < 0) die("failed to append data"); - + if (tracecmd_get_out_file_version(handle) >= FILE_VERSION_SECTIONS) + tracecmd_write_options(handle); return; } diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c index e4a0c3b3..671d6e9f 100644 --- a/tracecmd/trace-split.c +++ b/tracecmd/trace-split.c @@ -391,6 +391,9 @@ static double parse_file(struct tracecmd_input *handle, if (tracecmd_append_cpu_data(ohandle, cpus, cpu_list) < 0) die("Failed to append tracing data\n"); + if (tracecmd_get_out_file_version(ohandle) >= FILE_VERSION_SECTIONS) + tracecmd_write_options(ohandle); + current = end; for (cpu = 0; cpu < cpus; cpu++) { /* Set the tracecmd cursor to the next set of records */
When creating a trace file, two more APIs should be called, compared to the old flow: - tracecmd_write_buffer_info(), to write version 6 buffers metadata in the file. - tracecmd_write_options() after the trace data is written, for version 7 trace files, as the buffer metadata is appended to the options at the end. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- tracecmd/trace-listen.c | 6 ++++++ tracecmd/trace-record.c | 4 ++++ tracecmd/trace-restore.c | 3 ++- tracecmd/trace-split.c | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-)