X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=dc8b4a700bbb450331e6cb6366b4e8152a8d486d;hp=a6020737f8094f6c0dd158ab4ca2b0b64139eb4b;hb=9b3c1d6f8e01603488e317ffef7a8e3c15c98459;hpb=32cfb8adf760170061946d1f802677fb02f6dc96

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index a6020737..dc8b4a70 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -134,7 +134,8 @@ static void usage(FILE *fp)
 	fprintf(fp, "                                        (default: payload,context)\n");
 	fprintf(fp, "  -f, --fields name1<,name2,...> Print additional fields:\n");
 	fprintf(fp, "                                     all, trace, trace:hostname, trace:domain,\n");
-	fprintf(fp, "                                     trace:procname, trace:vpid, loglevel.\n");
+	fprintf(fp, "                                     trace:procname, trace:vpid, loglevel, emf.\n");
+	fprintf(fp, "                                     (default: trace:hostname,trace:procname,trace:vpid)\n");
 	fprintf(fp, "      --clock-cycles             Timestamp in cycles\n");
 	fprintf(fp, "      --clock-offset seconds     Clock offset in seconds\n");
 	fprintf(fp, "      --clock-seconds            Print the timestamps as [sec.ns]\n");
@@ -193,20 +194,23 @@ static int get_fields_args(poptContext *pc)
 	}
 	str = strtok_r(strlist, ",", &strctx);
 	do {
+		opt_trace_default_fields = 0;
 		if (!strcmp(str, "all"))
 			opt_all_fields = 1;
 		else if (!strcmp(str, "trace"))
 			opt_trace_field = 1;
+		else if (!strcmp(str, "trace:hostname"))
+			opt_trace_hostname_field = 1;
 		else if (!strcmp(str, "trace:domain"))
 			opt_trace_domain_field = 1;
 		else if (!strcmp(str, "trace:procname"))
 			opt_trace_procname_field = 1;
 		else if (!strcmp(str, "trace:vpid"))
 			opt_trace_vpid_field = 1;
-		else if (!strcmp(str, "trace:hostname"))
-			opt_trace_hostname_field = 1;
 		else if (!strcmp(str, "loglevel"))
 			opt_loglevel_field = 1;
+		else if (!strcmp(str, "emf"))
+			opt_emf_field = 1;
 		else {
 			fprintf(stderr, "[error] unknown field type %s\n", str);
 			return -EINVAL;