X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=dd335edbb20d56374559d450cdcbbfdf8b29861b;hp=c888ec60dc05f71cbf4142ad1c270e0980043021;hb=22133895a9a6b29ec17211f8d437bc128a7e4dfc;hpb=c8b219a3168dd382a167a72406e268550005e662

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index c888ec60..dd335edb 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -3,7 +3,9 @@
  *
  * Babeltrace Trace Converter
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +35,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 +51,7 @@ enum {
 	OPT_LIST,
 	OPT_VERBOSE,
 	OPT_DEBUG,
+	OPT_NAMES,
 };
 
 static struct poptOption long_options[] = {
@@ -58,6 +62,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 },
 };
 
@@ -72,18 +77,19 @@ static void usage(FILE *fp)
 	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");
 }
@@ -121,6 +127,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;
@@ -164,25 +173,22 @@ 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>");
+		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",
 			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",
@@ -197,12 +203,10 @@ int main(int argc, char **argv)
 		goto error_td_read;
 	}
 
-	if (!opt_output_path)
-		opt_output_path = "/dev/stdout";
-	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;
 	}