Added a new parameter "trace-cmd record --compression", can be used to
select the desired compression algorithm for the trace output file.
One of these strings can be passed:
"any" - auto select the best available compression algorithm
"none" - do not compress the trace file
name - the name of the desired compression algorithms, available
algorithms can be listed with "trace-cmd list -c"
If a compression is used, trace file version 7 is selected, otherwise
trace file version 6 is used.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
tracecmd/trace-record.c | 24 +++++++++++++++++++-----
tracecmd/trace-usage.c | 5 +++++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index e7a360a4..5e969dc7 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;
struct tsc_nsec tsc2nsec;
int data_flags;
int tsync_loop_interval;
@@ -3642,7 +3643,8 @@ 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, NULL);
+ network_handle = tracecmd_create_init_fd_msg(msg_handle,
+ listed_events, ctx->compression);
if (!network_handle)
goto error;
tracecmd_set_quiet(network_handle, quiet);
@@ -3660,7 +3662,8 @@ setup_connection(struct buffer_instance *instance, struct common_record_context
if (ret)
goto error;
} else {
- network_handle = tracecmd_create_init_fd_glob(msg_handle->fd, listed_events, NULL);
+ network_handle = tracecmd_create_init_fd_glob(msg_handle->fd,
+ listed_events, ctx->compression);
if (!network_handle)
goto error;
tracecmd_set_quiet(network_handle, quiet);
@@ -3848,7 +3851,8 @@ 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, NULL);
+ network_handle = tracecmd_create_init_fd_msg(instance->msg_handle,
+ listed_events, ctx->compression);
add_options(network_handle, ctx);
tracecmd_write_cmdlines(network_handle);
tracecmd_write_cpus(network_handle, instance->cpu_count);
@@ -4240,7 +4244,8 @@ static void record_data(struct common_record_context *ctx)
return;
if (latency) {
- handle = tracecmd_create_file_latency(ctx->output, local_cpu_count, NULL);
+ handle = tracecmd_create_file_latency(ctx->output,
+ local_cpu_count, ctx->compression);
tracecmd_set_quiet(handle, quiet);
} else {
if (!local_cpu_count)
@@ -4271,7 +4276,8 @@ static void record_data(struct common_record_context *ctx)
touch_file(temp_files[i]);
}
- handle = tracecmd_create_init_file_glob(ctx->output, listed_events, NULL);
+ handle = tracecmd_create_init_file_glob(ctx->output,
+ listed_events, ctx->compression);
if (!handle)
die("Error creating output file");
tracecmd_set_quiet(handle, quiet);
@@ -5531,6 +5537,7 @@ void init_top_instance(void)
}
enum {
+ OPT_comporession = 239,
OPT_tsc2nsec = 240,
OPT_fork = 241,
OPT_tsyncinterval = 242,
@@ -5965,6 +5972,7 @@ static void parse_record_options(int argc,
{"tsync-interval", required_argument, NULL, OPT_tsyncinterval},
{"fork", no_argument, NULL, OPT_fork},
{"tsc2nsec", no_argument, NULL, OPT_tsc2nsec},
+ {"compression", required_argument, NULL, OPT_comporession},
{NULL, 0, NULL, 0}
};
@@ -6386,6 +6394,12 @@ static void parse_record_options(int argc,
die("TSC to nanosecond is not supported");
ctx->instance->flags |= BUFFER_FL_TSC2NSEC;
break;
+ case OPT_comporession:
+ if (strcmp(optarg, "any") && strcmp(optarg, "none") &&
+ !tracecmd_compress_is_supported(optarg, NULL))
+ die("Compression algorithm %s is not supported", optarg);
+ ctx->compression = strdup(optarg);
+ break;
case OPT_quiet:
case 'q':
quiet = true;
diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c
index c388eccd..a1d7799a 100644
--- a/tracecmd/trace-usage.c
+++ b/tracecmd/trace-usage.c
@@ -68,6 +68,11 @@ static struct usage_help usage_help[] = {
" If a negative number is specified, timestamps synchronization is disabled"
" 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"
+ " --compression compress the trace output file, one of these strings can be passed:\n"
+ " any - auto select the best available compression algorithm\n"
+ " none - do not compress the trace file\n"
+ " name - the name of the desired compression algorithms\n"
+ " available algorithms can be listed with trace-cmd list -c\n"
},
{
"set",
--
2.31.1
|