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

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 21722d23..dc8b4a70 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -133,8 +133,9 @@ static void usage(FILE *fp)
 	fprintf(fp, "                                     none, all, scope, header, (context OR ctx)\n");
 	fprintf(fp, "                                        (default: payload,context)\n");
 	fprintf(fp, "  -f, --fields name1<,name2,...> Print additional fields:\n");
-	fprintf(fp, "                                     all, trace, trace:domain, trace:procname,\n");
-	fprintf(fp, "                                     trace:vpid, loglevel.\n");
+	fprintf(fp, "                                     all, trace, trace:hostname, trace:domain,\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,10 +194,13 @@ 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"))
@@ -205,6 +209,8 @@ static int get_fields_args(poptContext *pc)
 			opt_trace_vpid_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;