X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=64392d0c5aee66900cdca53db0dc190ddfcea6fa;hp=63ade113c81f719a1cb4b1a5b0178a5567fb826b;hb=c818559a7af1e5448cc8d3c5823a66e53061191f;hpb=7fb210365ad968646a0088d80f709165bf068950

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 63ade113..64392d0c 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -21,15 +21,27 @@
 #include <popt.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
 
-static const char *opt_input_format;
-static const char *opt_output_format;
+static char *opt_input_format;
+static char *opt_output_format;
 
 static const char *opt_input_path;
 static const char *opt_output_path;
 
 int babeltrace_verbose, babeltrace_debug;
 
+void strlower(char *str)
+{
+	while (*str) {
+		*str = tolower(*str);
+		str++;
+	}
+}
+
 enum {
 	OPT_NONE = 0,
 	OPT_HELP,
@@ -57,20 +69,21 @@ static void list_formats(FILE *fp)
 
 static void usage(FILE *fp)
 {
-	fprintf(fp, "Babeltrace %u.%u\n\n", BABELTRACE_VERSION_MAJOR,
+	fprintf(fp, "BabelTrace Trace Converter %u.%u\n\n",
+		BABELTRACE_VERSION_MAJOR,
 		BABELTRACE_VERSION_MINOR);
-	fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n");
+	fprintf(fp, "usage : babeltrace [OPTIONS] INPUT <OUTPUT>\n");
 	fprintf(fp, "\n");
-	fprintf(fp, "  INPUT               Input trace path\n");
-	fprintf(fp, "  OUTPUT              Output trace path\n");
+	fprintf(fp, "  INPUT                          Input trace path\n");
+	fprintf(fp, "  OUTPUT                         Output trace path (default: stdout)\n");
 	fprintf(fp, "\n");
-	fprintf(fp, "  -i, --input-format  Input trace path\n");
-	fprintf(fp, "  -o, --output-format Input trace path\n");
+	fprintf(fp, "  -i, --input-format FORMAT      Input trace format (default: ctf)\n");
+	fprintf(fp, "  -o, --output-format FORMAT     Output trace format (default: text)\n");
 	fprintf(fp, "\n");
-	fprintf(fp, "  -h, --help          This help message\n");
-	fprintf(fp, "  -l, --list          List available formats\n");
-	fprintf(fp, "  -v, --verbose       Verbose mode\n");
-	fprintf(fp, "  -d, --debug         Debug mode\n");
+	fprintf(fp, "  -h, --help                     This help message\n");
+	fprintf(fp, "  -l, --list                     List available formats\n");
+	fprintf(fp, "  -v, --verbose                  Verbose mode\n");
+	fprintf(fp, "  -d, --debug                    Debug mode\n");
 	list_formats(fp);
 	fprintf(fp, "\n");
 }
@@ -79,12 +92,17 @@ static void usage(FILE *fp)
  * Return 0 if caller should continue, < 0 if caller should return
  * error, > 0 if caller should exit without reporting error.
  */
-static int parse_options(int argc, const char **argv)
+static int parse_options(int argc, char **argv)
 {
 	poptContext pc;
 	int opt, ret = 0;
 
-	pc = poptGetContext(NULL, argc, argv, long_options, 0);
+	if (argc == 1) {
+		usage(stdout);
+		return 1;	/* exit cleanly */
+	}
+
+	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
@@ -115,10 +133,6 @@ static int parse_options(int argc, const char **argv)
 		goto end;
 	}
 	opt_output_path = poptGetArg(pc);
-	if (!opt_output_path) {
-		ret = -EINVAL;
-		goto end;
-	}
 end:
 	if (pc) {
 		poptFreeContext(pc);
@@ -126,13 +140,15 @@ end:
 	return ret;
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
 	int ret;
+	struct format *fmt_read, *fmt_write;
+	struct trace_descriptor *td_read, *td_write;
 
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
-		fprintf(stdout, "Error parsing options.\n");
+		fprintf(stdout, "Error parsing options.\n\n");
 		usage(stdout);
 		exit(EXIT_FAILURE);
 	} else if (ret > 0) {
@@ -141,12 +157,67 @@ int main(int argc, const char **argv)
 	printf_verbose("Verbose mode active.\n");
 	printf_debug("Debug mode active.\n");
 
+	if (opt_input_format)
+		strlower(opt_input_format);
+	if (opt_output_format)
+		strlower(opt_output_format);
+
 	printf_verbose("Converting from file: %s\n", opt_input_path);
 	printf_verbose("Converting from format: %s\n",
-		opt_input_format ? : "<autodetect>");
-	printf_verbose("Converting to file: %s\n", opt_output_path);
+		opt_input_format ? : "ctf <default>");
+	printf_verbose("Converting to file: %s\n",
+		opt_output_path ? : "<stdout>");
 	printf_verbose("Converting to format: %s\n",
-		opt_output_format ? : "CTF");
+		opt_output_format ? : "text <default>");
+
+	if (!opt_input_format)
+		opt_input_format = "ctf";
+	if (!opt_output_format)
+		opt_output_format = "text";
+	fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format));
+	if (!fmt_read) {
+		fprintf(stdout, "[error] Format \"%s\" is not supported.\n\n",
+			opt_input_format);
+		exit(EXIT_FAILURE);
+	}
+	if (!opt_output_format)
+		opt_output_format = "ctf";
+	fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format));
+	if (!fmt_write) {
+		fprintf(stdout, "[error] format \"%s\" is not supported.\n\n",
+			opt_output_format);
+		exit(EXIT_FAILURE);
+	}
+
+	td_read = fmt_read->open_trace(opt_input_path, O_RDONLY);
+	if (!td_read) {
+		fprintf(stdout, "[error] opening trace \"%s\" for reading.\n\n",
+			opt_input_path);
+		goto error_td_read;
+	}
+
+	td_write = fmt_write->open_trace(opt_output_path, O_RDWR);
+	if (!td_write) {
+		fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
+			opt_output_path ? : "<none>");
+		goto error_td_write;
+	}
+
+	ret = convert_trace(td_write, td_read);
+	if (ret) {
+		fprintf(stdout, "Error printing trace.\n\n");
+		goto error_copy_trace;
+	}
 
-	return 0;
+	fmt_write->close_trace(td_write);
+	fmt_read->close_trace(td_read);
+	exit(EXIT_SUCCESS);
+
+	/* Error handling */
+error_copy_trace:
+	fmt_write->close_trace(td_write);
+error_td_write:
+	fmt_read->close_trace(td_read);
+error_td_read:
+	exit(EXIT_FAILURE);
 }