Compress part of the trace.dat file metadata. If there is compression
support, chose file version 7 and compress these parts of the file:
- ftrace events format
- format of recorded events
- information of the mapping of function addresses to the function names
- trace_printk() format strings
- information of the mapping a PID to a process name
A new compression header is added in the file, right after the page size
information.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
lib/trace-cmd/trace-output.c | 145 +++++++++++++++++++++++++++++------
1 file changed, 123 insertions(+), 22 deletions(-)
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index 3c30edc1..627cea42 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -58,6 +58,10 @@ struct tracecmd_output {
bool quiet;
unsigned long file_state;
unsigned long file_version;
+
+ bool do_compress;
+ struct tracecmd_compression *compress;
+
struct list_head options;
struct tracecmd_msg_handle *msg_handle;
char *trace_clock;
@@ -78,12 +82,31 @@ struct list_event_system {
static stsize_t
do_write_check(struct tracecmd_output *handle, const void *data, tsize_t size)
{
+ if (handle->do_compress && handle->compress)
+ return tracecmd_compress_write(handle->compress, data, size);
+
if (handle->msg_handle)
return tracecmd_msg_data_send(handle->msg_handle, data, size);
return __do_write_check(handle->fd, data, size);
}
+static inline int do_lseek(struct tracecmd_output *handle, off_t offset, int whence)
+{
+ if (handle->do_compress)
+ return tracecmd_compress_lseek(handle->compress, offset, whence);
+ else
+ return lseek64(handle->fd, offset, whence);
+}
+
+static inline int do_preed(struct tracecmd_output *handle, void *dst, int len, off_t offset)
+{
+ if (handle->do_compress)
+ return tracecmd_compress_pread(handle->compress, dst, len, offset);
+ else
+ return pread(handle->fd, dst, len, offset);
+}
+
static short convert_endian_2(struct tracecmd_output *handle, short val)
{
if (!handle->pevent)
@@ -109,6 +132,31 @@ static unsigned long long convert_endian_8(struct tracecmd_output *handle,
return tep_read_number(handle->pevent, &val, 8);
}
+static inline void compression_reset(struct tracecmd_output *handle)
+{
+ if (handle->file_version < 7 || !handle->compress)
+ return;
+ tracecmd_compress_reset(handle->compress);
+ handle->do_compress = false;
+}
+
+static inline int compression_start(struct tracecmd_output *handle)
+{
+ if (handle->file_version < 7 || !handle->compress)
+ return 0;
+ tracecmd_compress_reset(handle->compress);
+ handle->do_compress = true;
+ return 0;
+}
+
+static inline int compression_end(struct tracecmd_output *handle)
+{
+ if (handle->file_version < 7 || !handle->compress)
+ return 0;
+ handle->do_compress = false;
+ return tracecmd_compress_block(handle->compress);
+}
+
/**
* tracecmd_set_quiet - Set if to print output to the screen
* @quiet: If non zero, print no output to the screen
@@ -159,6 +207,7 @@ void tracecmd_output_free(struct tracecmd_output *handle)
free(option);
}
free(handle->trace_clock);
+ tracecmd_compress_destroy(handle->compress);
free(handle);
}
@@ -659,13 +708,17 @@ static int read_ftrace_files(struct tracecmd_output *handle)
}
create_event_list_item(handle, &systems, &list);
-
+ compression_start(handle);
ret = copy_event_system(handle, systems);
+ if (!ret)
+ ret = compression_end(handle);
+ else
+ compression_reset(handle);
free_list_events(systems);
- handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
-
+ if (!ret)
+ handle->file_state = TRACECMD_FILE_FTRACE_EVENTS;
return ret;
}
@@ -715,6 +768,7 @@ static int read_event_files(struct tracecmd_output *handle,
for (slist = systems; slist; slist = slist->next)
count++;
+ compression_start(handle);
ret = -1;
endian4 = convert_endian_4(handle, count);
if (do_write_check(handle, &endian4, 4))
@@ -730,8 +784,14 @@ static int read_event_files(struct tracecmd_output *handle,
ret = copy_event_system(handle, slist);
}
- handle->file_state = TRACECMD_FILE_ALL_EVENTS;
+ if (!ret)
+ ret = compression_end(handle);
out_free:
+ if (!ret)
+ handle->file_state = TRACECMD_FILE_ALL_EVENTS;
+ else
+ compression_reset(handle);
+
free_list_events(systems);
return ret;
@@ -793,20 +853,20 @@ static int read_proc_kallsyms(struct tracecmd_output *handle,
if (kallsyms)
path = kallsyms;
-
+ compression_start(handle);
ret = stat(path, &st);
if (ret < 0) {
/* not found */
size = 0;
endian4 = convert_endian_4(handle, size);
- if (do_write_check(handle, &endian4, 4))
- return -1;
- return 0;
+ ret = do_write_check(handle, &endian4, 4);
+ goto out;
}
size = get_size(path);
endian4 = convert_endian_4(handle, size);
- if (do_write_check(handle, &endian4, 4))
- return -1;
+ ret = do_write_check(handle, &endian4, 4);
+ if (ret)
+ goto out;
set_proc_kptr_restrict(0);
check_size = copy_file(handle, path);
@@ -814,13 +874,18 @@ static int read_proc_kallsyms(struct tracecmd_output *handle,
errno = EINVAL;
tracecmd_warning("error in size of file '%s'", path);
set_proc_kptr_restrict(1);
- return -1;
+ ret = -1;
+ goto out;
}
set_proc_kptr_restrict(1);
- handle->file_state = TRACECMD_FILE_KALLSYMS;
-
- return 0;
+ ret = compression_end(handle);
+out:
+ if (!ret)
+ handle->file_state = TRACECMD_FILE_KALLSYMS;
+ else
+ compression_reset(handle);
+ return ret;
}
static int read_ftrace_printk(struct tracecmd_output *handle)
@@ -840,6 +905,7 @@ static int read_ftrace_printk(struct tracecmd_output *handle)
if (!path)
return -1;
+ compression_start(handle);
ret = stat(path, &st);
if (ret < 0) {
/* not found */
@@ -861,11 +927,14 @@ static int read_ftrace_printk(struct tracecmd_output *handle)
}
out:
- handle->file_state = TRACECMD_FILE_PRINTK;
put_tracing_file(path);
+ if (compression_end(handle))
+ return -1;
+ handle->file_state = TRACECMD_FILE_PRINTK;
return 0;
fail:
put_tracing_file(path);
+ compression_reset(handle);
return -1;
}
@@ -911,14 +980,39 @@ out_free:
static int select_file_version(struct tracecmd_output *handle,
struct tracecmd_input *ihandle)
{
- if (ihandle)
+ if (ihandle) {
handle->file_version = tracecmd_get_file_version(ihandle);
- else
- handle->file_version = FILE_VERSION;
+ } else {
+ handle->compress = tracecmd_compress_alloc(NULL, NULL, handle->fd,
+ handle->pevent, handle->msg_handle);
+ if (handle->compress)
+ handle->file_version = 7;
+ else
+ handle->file_version = 6;
+ }
return 0;
}
+static int write_compression_header(struct tracecmd_output *handle)
+{
+ const char *name = NULL;
+ const char *ver = NULL;
+ char *buf;
+ int ret;
+
+ ret = tracecmd_compress_proto_get_name(handle->compress, &name, &ver);
+ if (ret < 0 || !name || !ver)
+ return -1;
+ ret = asprintf(&buf, "%s %s", name, ver);
+ if (ret < 0)
+ return -1;
+ ret = do_write_check(handle, buf, strlen(buf) + 1);
+
+ free(buf);
+ return ret;
+}
+
static struct tracecmd_output *
create_file_fd(int fd, struct tracecmd_input *ihandle,
const char *tracing_dir,
@@ -993,7 +1087,8 @@ create_file_fd(int fd, struct tracecmd_input *ihandle,
if (do_write_check(handle, &endian4, 4))
goto out_free;
handle->file_state = TRACECMD_FILE_INIT;
-
+ if (handle->file_version >= 7 && write_compression_header(handle))
+ goto out_free;
if (ihandle)
return handle;
@@ -1285,11 +1380,17 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle)
handle->file_state);
return ret;
}
+ compression_start(handle);
+
ret = save_tracing_file_data(handle, "saved_cmdlines");
- if (ret < 0)
+ if (ret < 0) {
+ compression_reset(handle);
return ret;
- handle->file_state = TRACECMD_FILE_CMD_LINES;
- return 0;
+ }
+ ret = compression_end(handle);
+ if (!ret)
+ handle->file_state = TRACECMD_FILE_CMD_LINES;
+ return ret;
}
struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus)
--
2.31.1
|