X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=9d4212241274a14d2a8934de3a81a28ef8af4ec3;hp=b603dee53e22a555b0f7b94c9dda7e3651c71ddf;hb=1eb0c69cf759f535b1a926e667ae3f3aed486c9f;hpb=bbefb8dd3e1e198313e2eaf83f5451224ef8e27e

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index b603dee5..9d421224 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -33,6 +33,7 @@ static const char *opt_input_path;
 static const char *opt_output_path;
 
 int babeltrace_verbose, babeltrace_debug;
+int opt_field_names;
 
 void strlower(char *str)
 {
@@ -48,6 +49,7 @@ enum {
 	OPT_LIST,
 	OPT_VERBOSE,
 	OPT_DEBUG,
+	OPT_NAMES,
 };
 
 static struct poptOption long_options[] = {
@@ -58,6 +60,7 @@ static struct poptOption long_options[] = {
 	{ "list", 'l', POPT_ARG_NONE, NULL, OPT_LIST, NULL, NULL },
 	{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
 	{ "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
+	{ "names", 'n', POPT_ARG_NONE, NULL, OPT_NAMES, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -69,20 +72,22 @@ 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");
+	fprintf(fp, "  -n, --names                    Print field names\n");
 	list_formats(fp);
 	fprintf(fp, "\n");
 }
@@ -96,6 +101,11 @@ static int parse_options(int argc, char **argv)
 	poptContext pc;
 	int opt, ret = 0;
 
+	if (argc == 1) {
+		usage(stdout);
+		return 1;	/* exit cleanly */
+	}
+
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
@@ -115,6 +125,9 @@ static int parse_options(int argc, char **argv)
 		case OPT_DEBUG:
 			babeltrace_debug = 1;
 			break;
+		case OPT_NAMES:
+			opt_field_names = 1;
+			break;
 		default:
 			ret = -EINVAL;
 			goto end;
@@ -127,10 +140,6 @@ static int parse_options(int argc, char **argv)
 		goto end;
 	}
 	opt_output_path = poptGetArg(pc);
-	if (!opt_output_path) {
-		ret = -EINVAL;
-		goto end;
-	}
 end:
 	if (pc) {
 		poptFreeContext(pc);
@@ -162,19 +171,19 @@ int main(int argc, char **argv)
 
 	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) {
-		fprintf(stdout, "Error: input format autodetection not implemented yet.\n\n");
-		usage(stdout);
-		exit(EXIT_FAILURE);
-	}
+	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",
+		fprintf(stdout, "[error] Format \"%s\" is not supported.\n\n",
 			opt_input_format);
 		exit(EXIT_FAILURE);
 	}
@@ -182,30 +191,37 @@ int main(int argc, char **argv)
 		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",
+		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",
+		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_WRONLY);
+	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);
+			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;
+	}
+
 	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);