There is a need to convert trace files between different versions. A new
"trace-cmd convert" subcommand is introduced, which reads and input
trace file and copies to an output trace file. Both files can be from
different versions.
trace-cmd convert -i <input file> -o <output file> --file-version <ver>
--compression <compression>
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
tracecmd/Makefile | 1 +
tracecmd/include/trace-local.h | 2 +
tracecmd/trace-cmd.c | 1 +
tracecmd/trace-convert.c | 106 +++++++++++++++++++++++++++++++++
tracecmd/trace-usage.c | 13 ++++
5 files changed, 123 insertions(+)
create mode 100644 tracecmd/trace-convert.c
diff --git a/tracecmd/Makefile b/tracecmd/Makefile
index b7a23dc4..56742f0a 100644
--- a/tracecmd/Makefile
+++ b/tracecmd/Makefile
@@ -36,6 +36,7 @@ TRACE_CMD_OBJS += trace-usage.o
TRACE_CMD_OBJS += trace-dump.o
TRACE_CMD_OBJS += trace-clear.o
TRACE_CMD_OBJS += trace-vm.o
+TRACE_CMD_OBJS += trace-convert.o
ifeq ($(VSOCK_DEFINED), 1)
TRACE_CMD_OBJS += trace-agent.o
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index e9a0aea8..13dab44c 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -110,6 +110,8 @@ void trace_usage(int argc, char **argv);
void trace_dump(int argc, char **argv);
+void trace_convert(int argc, char **argv);
+
int trace_record_agent(struct tracecmd_msg_handle *msg_handle,
int cpus, int *fds,
int argc, char **argv, bool use_fifos,
diff --git a/tracecmd/trace-cmd.c b/tracecmd/trace-cmd.c
index 9fc126e4..a83a8d0b 100644
--- a/tracecmd/trace-cmd.c
+++ b/tracecmd/trace-cmd.c
@@ -133,6 +133,7 @@ struct command commands[] = {
{"list", trace_list},
{"help", trace_usage},
{"dump", trace_dump},
+ {"convert", trace_convert},
{"-h", trace_usage},
};
diff --git a/tracecmd/trace-convert.c b/tracecmd/trace-convert.c
new file mode 100644
index 00000000..2484d529
--- /dev/null
+++ b/tracecmd/trace-convert.c
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021, VMware, Tzvetomir Stoyanov <tz.stoyanov@xxxxxxxxx>
+ */
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "trace-local.h"
+#include "trace-cmd.h"
+#include "trace-cmd-private.h"
+
+static void convert_file(const char *in, const char *out, int file_version, char *compr)
+{
+ struct tracecmd_input *ihandle;
+ struct tracecmd_output *ohandle;
+
+ ihandle = tracecmd_open_head(in, 0);
+ if (!ihandle)
+ die("error reading %s", in);
+ ohandle = tracecmd_copy(ihandle, out, TRACECMD_FILE_CPU_FLYRECORD, file_version, compr);
+ if (!ohandle)
+ die("error writing %s", out);
+ tracecmd_output_close(ohandle);
+ tracecmd_close(ihandle);
+}
+
+enum {
+ OPT_file_version = 254,
+ OPT_comporession = 255,
+};
+
+void trace_convert(int argc, char **argv)
+{
+ char *input_file = NULL;
+ char *output_file = NULL;
+ char *compression = NULL;
+ int file_version = FILE_VERSION_DEFAULT;
+ int c;
+
+ if (argc < 2)
+ usage(argv);
+
+ if (strcmp(argv[1], "convert") != 0)
+ usage(argv);
+ for (;;) {
+ int option_index = 0;
+ static struct option long_options[] = {
+ {"compression", required_argument, NULL, OPT_comporession},
+ {"file-version", required_argument, NULL, OPT_file_version},
+ {"help", no_argument, NULL, '?'},
+ {NULL, 0, NULL, 0}
+ };
+
+ c = getopt_long (argc-1, argv+1, "+hi:o:", long_options, &option_index);
+ if (c == -1)
+ break;
+ switch (c) {
+ case 'i':
+ if (input_file)
+ die("Only one input file is supported, %s already set",
+ input_file);
+ input_file = optarg;
+ break;
+ case 'o':
+ if (output_file)
+ die("Only one output file is supported, %s already set",
+ output_file);
+ output_file = optarg;
+ 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);
+ compression = optarg;
+ break;
+ case OPT_file_version:
+ file_version = atoi(optarg);
+ if (file_version < FILE_VERSION_MIN || file_version > FILE_VERSION_MAX)
+ die("Unsupported file version %d, "
+ "supported versions are from %d to %d",
+ file_version, FILE_VERSION_MIN, FILE_VERSION_MAX);
+
+ break;
+ case 'h':
+ case '?':
+ default:
+ usage(argv);
+ }
+ }
+
+ if ((argc - optind) >= 2) {
+ if (output_file)
+ usage(argv);
+ output_file = argv[optind + 1];
+ }
+
+ if (!input_file)
+ input_file = DEFAULT_INPUT_FILE;
+ if (!output_file)
+ usage(argv);
+
+ convert_file(input_file, output_file, file_version, compression);
+}
diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c
index f463465a..9eb13ecb 100644
--- a/tracecmd/trace-usage.c
+++ b/tracecmd/trace-usage.c
@@ -407,6 +407,19 @@ static struct usage_help usage_help[] = {
" -h, --help show usage information\n"
" --verbose 'level' Set the desired log level\n"
},
+ {
+ "convert",
+ "convert trace file to different version",
+ " %s convert [options]\n"
+ " -i input file, default is trace.dat\n"
+ " -o output file, mandatory parameter.\n"
+ " The output file can be specified also as last argument of the command\n"
+ " --file-version set the desired trace file version\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" },
{
NULL, NULL, NULL
}
--
2.31.1
|