[07/10] trace-cmd library: Extend the create file APIs to support different compression

Message ID	20210422073902.484953-8-tz.stoyanov@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-trace-devel-owner@kernel.org> From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH 07/10] trace-cmd library: Extend the create file APIs to support different compression Date: Thu, 22 Apr 2021 10:38:59 +0300 Message-Id: <20210422073902.484953-8-tz.stoyanov@gmail.com> In-Reply-To: <20210422073902.484953-1-tz.stoyanov@gmail.com> References: <20210422073902.484953-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Add trace file compression \| expand [POC,00/10] Add trace file compression [01/10] trace-cmd: Add APIs for library initialization and free [02/10] trace-cmd library: Add support for compression algorithms [03/10] trace-cmd library: Compress part of the trace file [04/10] trace-cmd library: Read compressed trace file [05/10] trace-cmd library: Add new API to get compression of input handler [06/10] trace-cmd library: Inherit compression algorithm from input file [07/10] trace-cmd library: Extend the create file APIs to support different compression [08/10] trace-cmd record: Add new parameter --compression [09/10] trace-cmd dump: Add support for trace files version 7 [10/10] trace-cmd library: Add support for zlib compression library

diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h index 4d2116ab..244e6b4f 100644 --- a/lib/trace-cmd/include/private/trace-cmd-private.h +++ b/lib/trace-cmd/include/private/trace-cmd-private.h @@ -272,24 +272,27 @@ struct tracecmd_option; struct tracecmd_msg_handle; struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus, - unsigned long file_version); + unsigned long file_version, + const char *compression); struct tracecmd_output * tracecmd_create_init_file_glob(const char *output_file, struct tracecmd_event_list *list, - unsigned long file_version); + unsigned long file_version, const char *compression); struct tracecmd_output *tracecmd_create_init_fd(int fd); struct tracecmd_output * tracecmd_create_init_fd_glob(int fd, struct tracecmd_event_list *list, - unsigned long file_version); + unsigned long file_version, const char *compression); struct tracecmd_output * tracecmd_create_init_fd_msg(struct tracecmd_msg_handle *msg_handle, struct tracecmd_event_list *list, - unsigned long file_version); + unsigned long file_version, const char *compression); struct tracecmd_output *tracecmd_create_init_file(const char *output_file, - unsigned long file_version); + unsigned long file_version, + const char *compression); struct tracecmd_output *tracecmd_create_init_file_override(const char *output_file, const char *tracing_dir, const char *kallsyms, - unsigned long file_version); + unsigned long file_version, + const char *compression); struct tracecmd_option *tracecmd_add_option(struct tracecmd_output *handle, unsigned short id, int size, const void *data); diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c index 75cf143d..5fc7e778 100644 --- a/lib/trace-cmd/trace-output.c +++ b/lib/trace-cmd/trace-output.c @@ -1021,15 +1021,40 @@ out_free: return ret; } -static int select_file_version(struct tracecmd_output *handle, struct tracecmd_input *ihandle, - unsigned long file_version) +static int select_file_version(struct tracecmd_output *handle, + struct tracecmd_input *ihandle, + unsigned long file_version, const char *compression) { if (ihandle) { handle->file_version = tracecmd_get_file_version(ihandle); handle->compress_proto = tracecmd_get_file_comperssion(ihandle); - } else if (file_version > 0) { + return 0; + } + + if (file_version > 0) handle->file_version = file_version; - } else { + if (compression) { + if (handle->file_version && handle->file_version < 7) { + tracecmd_warning("Compression is not supported with trace file version %d", + handle->file_version); + return -1; + } + handle->compress_proto = tracecmd_compress_proto_get(compression, NULL); + if (!handle->compress_proto) { + tracecmd_warning("Compression algorithm %s is not supported", compression); + return -1; + } + if (!handle->file_version) + handle->file_version = 7; + } else if (handle->file_version >= 7) { + handle->compress_proto = tracecmd_compress_proto_select(); + if (!handle->compress_proto) { + tracecmd_warning("Compression is not supported"); + return -1; + } + } + + if (!handle->file_version) { handle->compress_proto = tracecmd_compress_proto_select(); if (handle->compress_proto) handle->file_version = 7; @@ -1065,7 +1090,8 @@ create_file_fd(int fd, struct tracecmd_input *ihandle, const char *kallsyms, struct tracecmd_event_list *list, struct tracecmd_msg_handle *msg_handle, - unsigned long file_version) + unsigned long file_version, + const char *compression) { struct tracecmd_output *handle; struct tep_handle *pevent; @@ -1086,7 +1112,7 @@ create_file_fd(int fd, struct tracecmd_input *ihandle, handle->msg_handle = msg_handle; - if (select_file_version(handle, ihandle, file_version)) + if (select_file_version(handle, ihandle, file_version, compression)) goto out_free; list_head_init(&handle->options); @@ -1166,7 +1192,7 @@ static struct tracecmd_output *create_file(const char *output_file, const char *tracing_dir, const char *kallsyms, struct tracecmd_event_list *list, - unsigned long file_version) + unsigned long file_version, const char *compression) { struct tracecmd_output *handle; int fd; @@ -1175,7 +1201,7 @@ static struct tracecmd_output *create_file(const char *output_file, if (fd < 0) return NULL; - handle = create_file_fd(fd, ihandle, tracing_dir, kallsyms, list, NULL, file_version); + handle = create_file_fd(fd, ihandle, tracing_dir, kallsyms, list, NULL, file_version, compression); if (!handle) { close(fd); unlink(output_file); @@ -1482,14 +1508,15 @@ int tracecmd_write_cmdlines(struct tracecmd_output *handle) } struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus, - unsigned long file_version) + unsigned long file_version, + const char *compression) { struct tracecmd_output *handle; char *path; int ret; handle = create_file(output_file, NULL, NULL, NULL, - &all_event_list, file_version); + &all_event_list, file_version, compression); if (!handle) return NULL; @@ -1785,46 +1812,48 @@ struct tracecmd_output *tracecmd_get_output_handle_fd(int fd) struct tracecmd_output *tracecmd_create_init_fd(int fd) { - return create_file_fd(fd, NULL, NULL, NULL, &all_event_list, NULL, 0); + return create_file_fd(fd, NULL, NULL, NULL, &all_event_list, NULL, 0, NULL); } struct tracecmd_output * tracecmd_create_init_fd_msg(struct tracecmd_msg_handle *msg_handle, struct tracecmd_event_list *list, - unsigned long file_version) + unsigned long file_version, const char *compression) { return create_file_fd(msg_handle->fd, NULL, NULL, NULL, - list, msg_handle, file_version); + list, msg_handle, file_version, compression); } struct tracecmd_output * tracecmd_create_init_fd_glob(int fd, struct tracecmd_event_list *list, - unsigned long file_version) + unsigned long file_version, const char *compression) { - return create_file_fd(fd, NULL, NULL, NULL, list, NULL, file_version); + return create_file_fd(fd, NULL, NULL, NULL, list, NULL, file_version, compression); } struct tracecmd_output * tracecmd_create_init_file_glob(const char *output_file, struct tracecmd_event_list *list, - unsigned long file_version) + unsigned long file_version, const char *compression) { - return create_file(output_file, NULL, NULL, NULL, list, file_version); + return create_file(output_file, NULL, NULL, NULL, list, file_version, compression); } struct tracecmd_output *tracecmd_create_init_file(const char *output_file, - unsigned long file_version) + unsigned long file_version, + const char *compression) { return create_file(output_file, NULL, NULL, NULL, - &all_event_list, file_version); + &all_event_list, file_version, compression); } struct tracecmd_output *tracecmd_create_init_file_override(const char *output_file, const char *tracing_dir, const char *kallsyms, - unsigned long file_version) + unsigned long file_version, + const char *compression) { return create_file(output_file, NULL, tracing_dir, kallsyms, - &all_event_list, file_version); + &all_event_list, file_version, compression); } /** @@ -1839,10 +1868,17 @@ struct tracecmd_output *tracecmd_create_init_file_override(const char *output_fi struct tracecmd_output *tracecmd_copy(struct tracecmd_input *ihandle, const char *file) { + struct tracecmd_compress_proto *compr; struct tracecmd_output *handle; + const char *compr_name = NULL; + + + compr = tracecmd_get_file_comperssion(ihandle); + if (compr) + tracecmd_compress_proto_get_name(compr, &compr_name, NULL); handle = create_file(file, ihandle, NULL, NULL, &all_event_list, - tracecmd_get_file_version(ihandle)); + tracecmd_get_file_version(ihandle), compr_name); if (!handle) return NULL; diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index f95db0e4..b8126eae 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3647,7 +3647,7 @@ setup_connection(struct buffer_instance *instance, struct common_record_context /* Now create the handle through this socket */ if (msg_handle->version == V3_PROTOCOL) { network_handle = tracecmd_create_init_fd_msg(msg_handle, listed_events, - ctx->file_version); + ctx->file_version, NULL); if (!network_handle) goto error; tracecmd_set_quiet(network_handle, quiet); @@ -3666,7 +3666,7 @@ setup_connection(struct buffer_instance *instance, struct common_record_context goto error; } else { network_handle = tracecmd_create_init_fd_glob(msg_handle->fd, listed_events, - ctx->file_version); + ctx->file_version, NULL); if (!network_handle) goto error; tracecmd_set_quiet(network_handle, quiet); @@ -3854,7 +3854,7 @@ static void setup_agent(struct buffer_instance *instance, struct tracecmd_output *network_handle; network_handle = tracecmd_create_init_fd_msg(instance->msg_handle, listed_events, - ctx->file_version); + ctx->file_version, NULL); add_options(network_handle, ctx); tracecmd_write_cmdlines(network_handle); tracecmd_write_cpus(network_handle, instance->cpu_count); @@ -4247,7 +4247,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) @@ -4279,7 +4279,7 @@ static void record_data(struct common_record_context *ctx) } handle = tracecmd_create_init_file_glob(ctx->output, listed_events, - ctx->file_version); + ctx->file_version, NULL); if (!handle) die("Error creating output file"); tracecmd_set_quiet(handle, quiet); diff --git a/tracecmd/trace-restore.c b/tracecmd/trace-restore.c index f2b15434..4b6a0c12 100644 --- a/tracecmd/trace-restore.c +++ b/tracecmd/trace-restore.c @@ -91,7 +91,7 @@ void trace_restore (int argc, char **argv) } handle = tracecmd_create_init_file_override(output, tracing_dir, - kallsyms, 0); + kallsyms, 0, NULL); if (!handle) die("Unabled to create output file %s", output); if (tracecmd_write_cmdlines(handle) < 0) @@ -128,7 +128,7 @@ void trace_restore (int argc, char **argv) handle = tracecmd_copy(ihandle, output); tracecmd_close(ihandle); } else - handle = tracecmd_create_init_file(output, 0); + handle = tracecmd_create_init_file(output, 0, NULL); if (!handle) die("error writing to %s", output);

[07/10] trace-cmd library: Extend the create file APIs to support different compression

Commit Message

Patch