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

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 5bcfc2a7..c377935e 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -25,6 +25,9 @@
 #include <babeltrace/context.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/events.h>
+/* TODO: fix object model for format-agnostic callbacks */
+#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/iterator.h>
 #include <popt.h>
@@ -120,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");
@@ -142,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;
@@ -158,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;
 		}
@@ -214,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) {
@@ -324,7 +335,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	GArray *trace_ids;
 	char lpath[PATH_MAX];
 	char * const paths[2] = { lpath, NULL };
-	int ret;
+	int ret = -1;
 
 	/*
 	 * Need to copy path, because fts_open can change it.
@@ -378,21 +389,26 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 
 			trace_id = bt_context_add_trace(ctx,
 				node->fts_accpath, format_str,
-				packet_seek);
+				packet_seek, NULL, NULL);
 			if (trace_id < 0) {
-				fprintf(stderr, "[error] [Context] opening trace \"%s\" from %s "
+				fprintf(stderr, "[warning] [Context] opening trace \"%s\" from %s "
 					"for reading.\n", node->fts_accpath, path);
-				ret = trace_id;
-				goto error;
+				/* Allow to skip erroneous traces. */
+				continue;
 			}
 			g_array_append_val(trace_ids, trace_id);
 		}
 	}
 
-	g_array_free(trace_ids, TRUE);
-	return 0;
-
 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;
 }
 
@@ -401,7 +417,7 @@ error:
 int convert_trace(struct trace_descriptor *td_write,
 		  struct bt_context *ctx)
 {
-	struct bt_iter *iter;
+	struct bt_ctf_iter *iter;
 	struct ctf_text_stream_pos *sout;
 	struct bt_iter_pos begin_pos;
 	struct bt_ctf_event *ctf_event;
@@ -411,25 +427,25 @@ int convert_trace(struct trace_descriptor *td_write,
 			trace_descriptor);
 
 	begin_pos.type = BT_SEEK_BEGIN;
-	iter = bt_iter_create(ctx, &begin_pos, NULL);
+	iter = bt_ctf_iter_create(ctx, &begin_pos, NULL);
 	if (!iter) {
 		ret = -1;
 		goto error_iter;
 	}
-	while ((ctf_event = bt_iter_read_ctf_event(iter))) {
-		ret = sout->parent.event_cb(&sout->parent, ctf_event->stream);
+	while ((ctf_event = bt_ctf_iter_read_event(iter))) {
+		ret = sout->parent.event_cb(&sout->parent, ctf_event->parent->stream);
 		if (ret) {
 			fprintf(stderr, "[error] Writing event failed.\n");
 			goto end;
 		}
-		ret = bt_iter_next(iter);
+		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
 			goto end;
 	}
 	ret = 0;
 
 end:
-	bt_iter_destroy(iter);
+	bt_ctf_iter_destroy(iter);
 error_iter:
 	return ret;
 }