X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=c377935edb4eee708113d50dd86ac5e6c54edb1a;hp=904c0150868630c47e60820a4e359635b6bf9588;hb=27cd3890b5ad7975669cf3ec3f7d575aa1e55c67;hpb=ca71827554747d1a4dabf9d82a7c4eacb6f908d5

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 904c0150..c377935e 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -123,8 +123,8 @@ static void usage(FILE *fp)
 	fprintf(fp, "      --no-delta                 Do not print time delta between consecutive events\n");
 	fprintf(fp, "  -n, --names name1<,name2,...>  Print field names:\n");
 	fprintf(fp, "                                     (payload OR args OR arg)\n");
-	fprintf(fp, "                                     all, scope, header, (context OR ctx)\n");
-	fprintf(fp, "                                        (payload active by default)\n");
+	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");
@@ -145,6 +145,7 @@ static int get_names_args(poptContext *pc)
 	char *str, *strlist, *strctx;
 
 	opt_payload_field_names = 0;
+	opt_context_field_names = 0;
 	strlist = (char *) poptGetOptArg(*pc);
 	if (!strlist) {
 		return -EINVAL;
@@ -161,7 +162,13 @@ static int get_names_args(poptContext *pc)
 			opt_header_field_names = 1;
 		else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg"))
 			opt_payload_field_names = 1;
-		else {
+		else if (!strcmp(str, "none")) {
+			opt_all_field_names = 0;
+			opt_scope_field_names = 0;
+			opt_context_field_names = 0;
+			opt_header_field_names = 0;
+			opt_payload_field_names = 0;
+		} else {
 			fprintf(stderr, "[error] unknown field name type %s\n", str);
 			return -EINVAL;
 		}
@@ -217,6 +224,7 @@ static int parse_options(int argc, char **argv)
 	poptReadDefaultConfig(pc, 0);
 
 	/* set default */
+	opt_context_field_names = 1;
 	opt_payload_field_names = 1;
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
@@ -392,10 +400,15 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		}
 	}
 
-	g_array_free(trace_ids, TRUE);
-	return ret;
-
 error:
+	/*
+	 * Return an error if no trace can be opened.
+	 */
+	if (ret == 0 && trace_ids->len == 0) {
+		fprintf(stderr, "[error] Cannot open any trace for reading.\n\n");
+		ret = -ENOENT;
+	}
+	g_array_free(trace_ids, TRUE);
 	return ret;
 }