From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
When the saved_cmdlines was moved to after the recording, as it makes sense
because they are created during the recording, the saving was just tossed
into tracecmd_append_cpu_data() as that was called at the end of recording.
Unfortunately, the trace-cmd restore (as well as trace-cmd split) used the
tracecmd_append_cpu_data() but expecting it not store the saved_cmdlines.
This broke both of them.
Now that there's an API called tracecmd_write_cmdlines(), have those that
need it call it directly, and remove it out of tracecmd_append_cpu_data().
Note, although this can help the trace-cmd restore code, it appears that the
code for trace-cmd split may still be broken, and needs to be fixed.
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
lib/trace-cmd/trace-output.c | 10 +++-------
tracecmd/trace-record.c | 3 +++
tracecmd/trace-split.c | 4 ++++
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index c8f8a106c295..917d20cfcfd6 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -1446,13 +1446,6 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,
{
int ret;
- /*
- * Save the command lines;
- */
- ret = tracecmd_write_cmdlines(handle);
- if (ret)
- return ret;
-
ret = tracecmd_write_cpus(handle, cpus);
if (ret)
return ret;
@@ -1554,6 +1547,9 @@ tracecmd_create_file_glob(const char *output_file,
if (!handle)
return NULL;
+ if (tracecmd_write_cmdlines(handle))
+ return NULL;
+
if (tracecmd_append_cpu_data(handle, cpus, cpu_data_files) < 0) {
tracecmd_output_close(handle);
return NULL;
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 4337967e11e5..e7428788b1bb 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4236,6 +4236,9 @@ static void record_data(struct common_record_context *ctx)
add_guest_info(handle, instance);
}
+ if (tracecmd_write_cmdlines(handle))
+ die("Writing cmdlines");
+
tracecmd_append_cpu_data(handle, local_cpu_count, temp_files);
for (i = 0; i < max_cpu_count; i++)
diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c
index 8366d1286d9e..7c9863d481bc 100644
--- a/tracecmd/trace-split.c
+++ b/tracecmd/trace-split.c
@@ -384,6 +384,10 @@ static double parse_file(struct tracecmd_input *handle,
for (cpu = 0; cpu < cpus; cpu ++)
cpu_list[cpu] = cpu_data[cpu].file;
+ /* TODO: Fix me, this is suppose to come from handle */
+ if (tracecmd_write_cmdlines(ohandle))
+ die("Writing cmdlines");
+
tracecmd_append_cpu_data(ohandle, cpus, cpu_list);
current = end;
--
2.30.0
|