The new API can be used to configure compression algorithm on an output
handle 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 | 58 ++++++++++++++++++-
tracecmd/trace-record.c | 2 +-
3 files changed, 60 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 bcc4c9f3..e22c3b7e 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -302,13 +302,14 @@ int tracecmd_output_set_trace_dir(struct tracecmd_output *handle, const char *tr
int tracecmd_output_set_kallsyms(struct tracecmd_output *handle, const char *kallsyms);
int tracecmd_output_set_from_input(struct tracecmd_output *handle, struct tracecmd_input *ihandle);
int tracecmd_output_set_version(struct tracecmd_output *handle, int file_version);
+int tracecmd_output_set_compression(struct tracecmd_output *handle, const char *compression);
int tracecmd_output_write_headers(struct tracecmd_output *handle,
struct tracecmd_event_list *list);
struct tracecmd_output *tracecmd_output_create(const char *output_file);
struct tracecmd_output *tracecmd_output_create_fd(int fd);
struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus,
- int file_version);
+ int file_version, const char *compression);
struct tracecmd_option *tracecmd_add_option(struct tracecmd_output *handle,
unsigned short id, int size,
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index c37fee1a..f13d2b8e 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -263,6 +263,7 @@ void tracecmd_output_free(struct tracecmd_output *handle)
free(handle->strings);
free(handle->trace_clock);
+ tracecmd_compress_destroy(handle->compress);
free(handle);
}
@@ -1341,6 +1342,55 @@ int tracecmd_output_set_version(struct tracecmd_output *handle, int file_version
if (file_version < FILE_VERSION_MIN || file_version > FILE_VERSION_MAX)
return -1;
handle->file_version = file_version;
+ if (handle->file_version < FILE_VERSION_COMPRESSION)
+ handle->compress = NULL;
+ return 0;
+}
+
+/**
+ * tracecmd_output_set_compression - Set file compression algorithm of the output handle
+ * @handle: output handle 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_headers().
+ *
+ * Returns 0 on success, or -1 in case of an error:
+ * - the output file handle is not allocated or not in expected state.
+ * - the specified compression algorithm is not available
+ */
+int tracecmd_output_set_compression(struct tracecmd_output *handle, const char *compression)
+{
+ if (!handle || handle->file_state != TRACECMD_FILE_ALLOCATED)
+ return -1;
+
+ handle->compress = NULL;
+ if (compression && strcmp(compression, "none")) {
+ if (!strcmp(compression, "any")) {
+ handle->compress = tracecmd_compress_alloc(NULL, NULL, handle->fd,
+ handle->pevent,
+ handle->msg_handle);
+ if (!handle->compress)
+ tracecmd_warning("No compression algorithms are supported");
+ } else {
+ handle->compress = tracecmd_compress_alloc(compression, NULL, handle->fd,
+ handle->pevent,
+ handle->msg_handle);
+ if (!handle->compress) {
+ tracecmd_warning("Compression algorithm %s is not supported",
+ compression);
+ return -1;
+ }
+ }
+ }
+ if (handle->compress && handle->file_version < FILE_VERSION_COMPRESSION) {
+ handle->file_version = FILE_VERSION_COMPRESSION;
+ if (handle->msg_handle)
+ tracecmd_msg_handle_cache(handle->msg_handle);
+ }
+
return 0;
}
@@ -1951,7 +2001,7 @@ out_add_buffer_option(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;
@@ -1964,6 +2014,12 @@ struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, in
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_headers(handle, NULL))
goto out_free;
/*
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 4cf48c86..ece5a0c2 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4511,7 +4511,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.34.1
|