Added a new optional parameter to "trace-cmd record", can be used to
select the desired compression algorithm for the trace output file.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
tracecmd/trace-record.c | 18 +++++++++++++-----
tracecmd/trace-usage.c | 1 +
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index b8126eae..9b01ee05 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -199,6 +199,7 @@ struct common_record_context {
char *date2ts;
char *user;
const char *clock;
+ const char *compression;
unsigned long file_version;
struct tsc_nsec tsc2nsec;
int data_flags;
@@ -3647,7 +3648,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, NULL);
+ ctx->file_version, ctx->compression);
if (!network_handle)
goto error;
tracecmd_set_quiet(network_handle, quiet);
@@ -3666,7 +3667,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, NULL);
+ ctx->file_version, ctx->compression);
if (!network_handle)
goto error;
tracecmd_set_quiet(network_handle, quiet);
@@ -3854,7 +3855,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, NULL);
+ ctx->file_version, ctx->compression);
add_options(network_handle, ctx);
tracecmd_write_cmdlines(network_handle);
tracecmd_write_cpus(network_handle, instance->cpu_count);
@@ -4247,7 +4248,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, NULL);
+ ctx->file_version, ctx->compression);
tracecmd_set_quiet(handle, quiet);
} else {
if (!local_cpu_count)
@@ -4279,7 +4280,7 @@ static void record_data(struct common_record_context *ctx)
}
handle = tracecmd_create_init_file_glob(ctx->output, listed_events,
- ctx->file_version, NULL);
+ ctx->file_version, ctx->compression);
if (!handle)
die("Error creating output file");
tracecmd_set_quiet(handle, quiet);
@@ -5505,6 +5506,7 @@ void init_top_instance(void)
}
enum {
+ OPT_comporession = 238,
OPT_file_version = 239,
OPT_tsc2nsec = 240,
OPT_fork = 241,
@@ -5941,6 +5943,7 @@ static void parse_record_options(int argc,
{"fork", no_argument, NULL, OPT_fork},
{"tsc2nsec", no_argument, NULL, OPT_tsc2nsec},
{"file-version", required_argument, NULL, OPT_file_version},
+ {"compression", required_argument, NULL, OPT_comporession},
{NULL, 0, NULL, 0}
};
@@ -6367,6 +6370,11 @@ static void parse_record_options(int argc,
if (!tracecmd_is_version_supported(ctx->file_version))
die("File version %d is not supported", ctx->file_version);
break;
+ case OPT_comporession:
+ ctx->compression = strdup(optarg);
+ if (!tracecmd_compress_proto_get(ctx->compression, NULL))
+ die("Compression algorithm %s is not supported", ctx->compression);
+ break;
case OPT_quiet:
case 'q':
quiet = true;
diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c
index e5b54114..f2383834 100644
--- a/tracecmd/trace-usage.c
+++ b/tracecmd/trace-usage.c
@@ -69,6 +69,7 @@ static struct usage_help usage_help[] = {
" If 0 is specified, no loop is performed - timestamps offset is calculated only twice,"
" at the beginnig and at the end of the trace\n"
" --file-version select the desired version of the trace output file\n"
+ " --compression select the desired compression algorithm for the trace output file\n"
},
{
"set",
--
2.30.2
|