When copying header data between trace files, handle the file versions.
Internal library functions for copying these headers are fixed to work
with trace file version 7:
copy_header_files
copy_ftrace_files
copy_event_files
copy_proc_kallsyms
copy_command_lines
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
lib/trace-cmd/include/trace-cmd-local.h | 3 +
lib/trace-cmd/trace-input.c | 211 ++++++++++++++++++++----
lib/trace-cmd/trace-output.c | 10 ++
lib/trace-cmd/trace-util.c | 8 +-
4 files changed, 200 insertions(+), 32 deletions(-)
diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h
index 18d2d05b..92bc288a 100644
--- a/lib/trace-cmd/include/trace-cmd-local.h
+++ b/lib/trace-cmd/include/trace-cmd-local.h
@@ -46,6 +46,9 @@ int out_uncompress_block(struct tracecmd_output *handle);
int out_compression_start(struct tracecmd_output *handle, bool compress);
int out_compression_end(struct tracecmd_output *handle, bool compress);
void out_compression_reset(struct tracecmd_output *handle, bool compress);
+bool out_check_compression(struct tracecmd_output *handle);
+
+void out_set_file_state(struct tracecmd_output *handle, int new_state);
unsigned long long out_copy_fd_compress(struct tracecmd_output *handle,
int fd, unsigned long long max,
unsigned long long *write_size);
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 5cc881a8..e4fdc534 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -4443,164 +4443,313 @@ static int read_copy_data(struct tracecmd_input *in_handle,
return -1;
}
+
+static bool check_in_state(struct tracecmd_input *handle, int new_state)
+{
+ return check_file_state(handle->file_version, handle->file_state, new_state);
+}
+
static int copy_header_files(struct tracecmd_input *in_handle,
struct tracecmd_output *out_handle)
{
+ bool compress = out_check_compression(out_handle);
+ struct file_section *sec;
+ unsigned long long offset;
unsigned long long size;
- if (in_handle->file_state != TRACECMD_FILE_HEADERS - 1)
+ if (!check_in_state(in_handle, TRACECMD_FILE_HEADERS) ||
+ !check_out_state(out_handle, TRACECMD_FILE_HEADERS))
return -1;
+ sec = section_open(in_handle, TRACECMD_OPTION_HEADER_INFO);
+ if (!sec)
+ return -1;
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_HEADER_INFO,
+ "headers", TRACECMD_SEC_FL_COMPRESS, true);
+ out_compression_start(out_handle, compress);
+
/* "header_page" */
if (read_copy_data(in_handle, 12, out_handle) < 0)
- return -1;
+ goto error;
if (read_copy_size8(in_handle, out_handle, &size) < 0)
- return -1;
+ goto error;
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
+ goto error;
/* "header_event" */
if (read_copy_data(in_handle, 13, out_handle) < 0)
- return -1;
+ goto error;
if (read_copy_size8(in_handle, out_handle, &size) < 0)
- return -1;
+ goto error;
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
+ goto error;
in_handle->file_state = TRACECMD_FILE_HEADERS;
+ if (out_compression_end(out_handle, compress))
+ goto error;
+ out_set_file_state(out_handle, in_handle->file_state);
+ section_close(in_handle, sec);
+
+ if (out_update_section_header(out_handle, offset))
+ goto error;
return 0;
+error:
+ out_compression_reset(out_handle, compress);
+ section_close(in_handle, sec);
+ return -1;
}
static int copy_ftrace_files(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle)
{
+ bool compress = out_check_compression(out_handle);
+ struct file_section *sec;
+ unsigned long long offset;
unsigned long long size;
unsigned int count;
unsigned int i;
- if (in_handle->file_state != TRACECMD_FILE_FTRACE_EVENTS - 1)
+ if (!check_in_state(in_handle, TRACECMD_FILE_FTRACE_EVENTS) ||
+ !check_out_state(out_handle, TRACECMD_FILE_FTRACE_EVENTS))
return -1;
- if (read_copy_size4(in_handle, out_handle, &count) < 0)
+ sec = section_open(in_handle, TRACECMD_OPTION_FTRACE_EVENTS);
+ if (!sec)
return -1;
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_FTRACE_EVENTS,
+ "ftrace events", TRACECMD_SEC_FL_COMPRESS, true);
+
+ out_compression_start(out_handle, compress);
+
+ if (read_copy_size4(in_handle, out_handle, &count) < 0)
+ goto error;
for (i = 0; i < count; i++) {
if (read_copy_size8(in_handle, out_handle, &size) < 0)
- return -1;
+ goto error;
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
+ goto error;
}
in_handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
+ if (out_compression_end(out_handle, compress))
+ goto error;
+ out_set_file_state(out_handle, in_handle->file_state);
+
+ section_close(in_handle, sec);
+
+ if (out_update_section_header(out_handle, offset))
+ goto error;
return 0;
+error:
+ out_compression_reset(out_handle, compress);
+ section_close(in_handle, sec);
+ return -1;
}
static int copy_event_files(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle)
{
+ bool compress = out_check_compression(out_handle);
+ struct file_section *sec;
+ unsigned long long offset;
unsigned long long size;
char *system;
unsigned int systems;
unsigned int count;
unsigned int i,x;
- if (in_handle->file_state != TRACECMD_FILE_ALL_EVENTS - 1)
+ if (!check_in_state(in_handle, TRACECMD_FILE_ALL_EVENTS) ||
+ !check_out_state(out_handle, TRACECMD_FILE_ALL_EVENTS))
return -1;
- if (read_copy_size4(in_handle, out_handle, &systems) < 0)
+ sec = section_open(in_handle, TRACECMD_OPTION_EVENT_FORMATS);
+ if (!sec)
return -1;
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_EVENT_FORMATS,
+ "events format", TRACECMD_SEC_FL_COMPRESS, true);
+
+ out_compression_start(out_handle, compress);
+
+ if (read_copy_size4(in_handle, out_handle, &systems) < 0)
+ goto error;
for (i = 0; i < systems; i++) {
system = read_string(in_handle);
if (!system)
- return -1;
+ goto error;
if (do_write_check(out_handle, system, strlen(system) + 1)) {
free(system);
- return -1;
+ goto error;
}
free(system);
if (read_copy_size4(in_handle, out_handle, &count) < 0)
- return -1;
+ goto error;
for (x=0; x < count; x++) {
if (read_copy_size8(in_handle, out_handle, &size) < 0)
- return -1;
+ goto error;
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
+ goto error;
}
}
in_handle->file_state = TRACECMD_FILE_ALL_EVENTS;
+ if (out_compression_end(out_handle, compress))
+ goto error;
+ out_set_file_state(out_handle, in_handle->file_state);
+
+ section_close(in_handle, sec);
+
+ if (out_update_section_header(out_handle, offset))
+ goto error;
return 0;
+error:
+ out_compression_reset(out_handle, compress);
+ section_close(in_handle, sec);
+ return -1;
}
static int copy_proc_kallsyms(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle)
{
+ bool compress = out_check_compression(out_handle);
+ struct file_section *sec;
+ unsigned long long offset;
unsigned int size;
- if (in_handle->file_state != TRACECMD_FILE_KALLSYMS - 1)
+ if (!check_in_state(in_handle, TRACECMD_FILE_KALLSYMS) ||
+ !check_out_state(out_handle, TRACECMD_FILE_KALLSYMS))
return -1;
- if (read_copy_size4(in_handle, out_handle, &size) < 0)
+ sec = section_open(in_handle, TRACECMD_OPTION_KALLSYMS);
+ if (!sec)
return -1;
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_KALLSYMS,
+ "kallsyms", TRACECMD_SEC_FL_COMPRESS, true);
+
+ out_compression_start(out_handle, compress);
+ if (read_copy_size4(in_handle, out_handle, &size) < 0)
+ goto error;
if (!size)
- return 0; /* OK? */
+ goto out; /* OK? */
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
-
+ goto error;
+out:
in_handle->file_state = TRACECMD_FILE_KALLSYMS;
+ if (out_compression_end(out_handle, compress))
+ goto error;
+ out_set_file_state(out_handle, in_handle->file_state);
+
+ section_close(in_handle, sec);
+
+ if (out_update_section_header(out_handle, offset))
+ goto error;
return 0;
+error:
+ out_compression_reset(out_handle, compress);
+ section_close(in_handle, sec);
+ return -1;
}
static int copy_ftrace_printk(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle)
{
+ bool compress = out_check_compression(out_handle);
+ struct file_section *sec;
+ unsigned long long offset;
unsigned int size;
- if (in_handle->file_state != TRACECMD_FILE_PRINTK - 1)
+ if (!check_in_state(in_handle, TRACECMD_FILE_PRINTK) ||
+ !check_out_state(out_handle, TRACECMD_FILE_PRINTK))
return -1;
- if (read_copy_size4(in_handle, out_handle, &size) < 0)
+ sec = section_open(in_handle, TRACECMD_OPTION_PRINTK);
+ if (!sec)
return -1;
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_PRINTK,
+ "printk", TRACECMD_SEC_FL_COMPRESS, true);
+
+ out_compression_start(out_handle, compress);
+
+ if (read_copy_size4(in_handle, out_handle, &size) < 0)
+ goto error;
if (!size)
- return 0; /* OK? */
+ goto out; /* OK? */
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
+ goto error;
+out:
in_handle->file_state = TRACECMD_FILE_PRINTK;
+ if (out_compression_end(out_handle, compress))
+ goto error;
+ out_set_file_state(out_handle, in_handle->file_state);
+
+ section_close(in_handle, sec);
+
+ if (out_update_section_header(out_handle, offset))
+ goto error;
return 0;
+error:
+ out_compression_reset(out_handle, compress);
+ section_close(in_handle, sec);
+ return -1;
}
static int copy_command_lines(struct tracecmd_input *in_handle, struct tracecmd_output *out_handle)
{
+ bool compress = out_check_compression(out_handle);
+ struct file_section *sec;
+ unsigned long long offset;
unsigned long long size;
- if (in_handle->file_state != TRACECMD_FILE_CMD_LINES - 1)
+ if (!check_in_state(in_handle, TRACECMD_FILE_CMD_LINES) ||
+ !check_out_state(out_handle, TRACECMD_FILE_CMD_LINES))
return -1;
- if (read_copy_size8(in_handle, out_handle, &size) < 0)
+ sec = section_open(in_handle, TRACECMD_OPTION_CMDLINES);
+ if (!sec)
return -1;
+ offset = out_write_section_header(out_handle, TRACECMD_OPTION_CMDLINES,
+ "command lines", TRACECMD_SEC_FL_COMPRESS, true);
+
+ out_compression_start(out_handle, compress);
+
+ if (read_copy_size8(in_handle, out_handle, &size) < 0)
+ goto error;
if (!size)
- return 0; /* OK? */
+ goto out; /* OK? */
if (read_copy_data(in_handle, size, out_handle) < 0)
- return -1;
+ goto error;
+out:
in_handle->file_state = TRACECMD_FILE_CMD_LINES;
+ if (out_compression_end(out_handle, compress))
+ goto error;
+ out_set_file_state(out_handle, in_handle->file_state);
+
+ section_close(in_handle, sec);
+
+ if (out_update_section_header(out_handle, offset))
+ goto error;
return 0;
+error:
+ out_compression_reset(out_handle, compress);
+ section_close(in_handle, sec);
+ return -1;
}
/**
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index 2c55e95c..ea5407f1 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -2502,11 +2502,21 @@ out_free:
return NULL;
}
+__hidden void out_set_file_state(struct tracecmd_output *handle, int new_state)
+{
+ handle->file_state = new_state;
+}
+
__hidden bool check_out_state(struct tracecmd_output *handle, int new_state)
{
return check_file_state(handle->file_version, handle->file_state, new_state);
}
+__hidden bool out_check_compression(struct tracecmd_output *handle)
+{
+ return (handle->compress != NULL);
+}
+
/**
* tracecmd_get_out_file_version - return the trace.dat file version
* @handle: output handle for the trace.dat file
diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c
index 97db6ed9..e9e444cd 100644
--- a/lib/trace-cmd/trace-util.c
+++ b/lib/trace-cmd/trace-util.c
@@ -637,6 +637,12 @@ static void __attribute__((destructor)) tracecmd_lib_free(void)
__hidden bool check_file_state(unsigned long file_version, int current_state, int new_state)
{
+ if (file_version >= FILE_VERSION_SECTIONS) {
+ if (current_state < TRACECMD_FILE_INIT)
+ return false;
+ return true;
+ }
+
switch (new_state) {
case TRACECMD_FILE_HEADERS:
case TRACECMD_FILE_FTRACE_EVENTS:
@@ -649,7 +655,7 @@ __hidden bool check_file_state(unsigned long file_version, int current_state, in
return true;
break;
case TRACECMD_FILE_OPTIONS:
- if (current_state == (new_state - 1))
+ if (file_version < FILE_VERSION_SECTIONS && current_state == TRACECMD_FILE_CPU_COUNT)
return true;
break;
case TRACECMD_FILE_CPU_LATENCY:
--
2.31.1
|