The new API can be used to configure compression algorithm on an output
handler to a trace file.
tracecmd_output_set_compression()
The API for creation of latency trace file is extended with compression
parameter.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
.../include/private/trace-cmd-private.h | 3 +-
lib/trace-cmd/trace-output.c | 57 ++++++++++++++++++-
tracecmd/trace-record.c | 2 +-
3 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 30315c00..8f5408ff 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -297,12 +297,13 @@ int tracecmd_output_set_trace_dir(struct tracecmd_output *handler, const char *t
int tracecmd_output_set_kallsyms(struct tracecmd_output *handler, const char *kallsyms);
int tracecmd_output_set_from_input(struct tracecmd_output *handler, struct tracecmd_input *ihandle);
int tracecmd_output_set_version(struct tracecmd_output *handler, int file_version);
+int tracecmd_output_set_compression(struct tracecmd_output *handler, const char *compression);
int tracecmd_output_write_init(struct tracecmd_output *handler);
int tracecmd_output_write_headers(struct tracecmd_output *handler,
struct tracecmd_event_list *list);
struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus,
- int file_version);
+ int file_version, const char *compression);
struct tracecmd_output *tracecmd_create_init_fd(int fd);
struct tracecmd_output *tracecmd_create_init_file(const char *output_file);
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index edf05cfe..c15c6979 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -234,6 +234,7 @@ void tracecmd_output_free(struct tracecmd_output *handle)
free(option);
}
free(handle->trace_clock);
+ tracecmd_compress_destroy(handle->compress);
free(handle);
}
@@ -1258,9 +1259,57 @@ int tracecmd_output_set_version(struct tracecmd_output *handler, int file_versio
if (file_version < FILE_VERSION_MIN || file_version > FILE_VERSION_MAX)
return -1;
handler->file_version = file_version;
+ if (handler->file_version < FILE_VERSION_COMPRESSION)
+ handler->compress = NULL;
return 0;
}
+/**
+ * tracecmd_output_set_compression - Set file compression algorithm of the output handler
+ * @handle: output handler to a trace file.
+ * @compression: name of the desired compression algorithm. Can be one of:
+ * - "none" - do not use compression
+ * - "all" - use the best available compression algorithm
+ * - or specific name of the desired compression algorithm
+ *
+ * This API must be called before tracecmd_output_write_init().
+ *
+ * Returns 0 on success, or -1 in case of an error:
+ * - the output file handler is not allocated or not in expected state.
+ * - the specified compression algorithm is not available
+ */
+int tracecmd_output_set_compression(struct tracecmd_output *handler, const char *compression)
+{
+ if (!handler || handler->file_state != TRACECMD_FILE_ALLOCATED)
+ return -1;
+
+ handler->compress = NULL;
+ if (compression && strcmp(compression, "none")) {
+ if (!strcmp(compression, "any")) {
+ handler->compress = tracecmd_compress_alloc(NULL, NULL, handler->fd,
+ handler->pevent,
+ handler->msg_handle);
+ if (!handler->compress)
+ tracecmd_warning("No compression algorithms are supported");
+ } else {
+ handler->compress = tracecmd_compress_alloc(compression, NULL, handler->fd,
+ handler->pevent,
+ handler->msg_handle);
+ if (!handler->compress) {
+ tracecmd_warning("Compression algorithm %s is not supported",
+ compression);
+ return -1;
+ }
+ }
+ }
+ if (handler->compress && handler->file_version < FILE_VERSION_COMPRESSION) {
+ handler->file_version = FILE_VERSION_COMPRESSION;
+ if (handler->msg_handle)
+ tracecmd_msg_handle_cache(handler->msg_handle);
+ }
+
+ return 0;
+}
/**
* tracecmd_output_write_init - Write the initial magics in the trace file
@@ -1846,7 +1895,7 @@ out_add_buffer_option_v7(struct tracecmd_output *handle, const char *name,
}
struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus,
- int file_version)
+ int file_version, const char *compression)
{
enum tracecmd_section_flags flags = 0;
struct tracecmd_output *handle;
@@ -1863,6 +1912,12 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in
goto out_free;
if (file_version && tracecmd_output_set_version(handle, file_version))
goto out_free;
+ if (compression) {
+ if (tracecmd_output_set_compression(handle, compression))
+ goto out_free;
+ } else if (file_version >= FILE_VERSION_COMPRESSION) {
+ tracecmd_output_set_compression(handle, "any");
+ }
if (tracecmd_output_write_init(handle))
goto out_free;
if (tracecmd_output_write_headers(handle, NULL))
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 421bb7d4..fb6de81b 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4516,7 +4516,7 @@ static void record_data(struct common_record_context *ctx)
if (latency) {
handle = tracecmd_create_file_latency(ctx->output, local_cpu_count,
- ctx->file_version);
+ ctx->file_version, NULL);
tracecmd_set_quiet(handle, quiet);
} else {
if (!local_cpu_count)
--
2.31.1
|