X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fcommon%2Fmetadata%2Fdecoder.c;h=85a9fbe1387e3ecef99b4e266b9100161912959d;hb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;hp=814da165eb316f0db73c8803d66b37e4de63b7c9;hpb=9d408fcae74602e3591f66623ceb85f482d948ed;p=babeltrace.git

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index 814da165..85a9fbe1 100644
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 #include <babeltrace/compat/uuid-internal.h>
 #include <babeltrace/compat/memstream-internal.h>
 #include <babeltrace/babeltrace.h>
@@ -417,7 +417,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
 	char *buf = NULL;
 	bool close_fp = false;
 
-	assert(mdec);
+	BT_ASSERT(mdec);
 
 	if (ctf_metadata_decoder_is_packetized(fp, &mdec->bo)) {
 		BT_LOGD("Metadata stream is packetized: mdec-addr=%p", mdec);
@@ -495,7 +495,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
 		goto end;
 	}
 
-	assert(fp);
+	BT_ASSERT(fp);
 	ret = ctf_scanner_append_ast(scanner, fp);
 	if (ret) {
 		BT_LOGE("Cannot create the metadata AST out of the metadata text: "
@@ -514,6 +514,10 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
 
 	ret = ctf_visitor_generate_ir_visit_node(mdec->visitor,
 		&scanner->ast->root);
+	// TODO
+	ret = -1;
+	goto end;
+
 	switch (ret) {
 	case 0:
 		/* Success */
@@ -552,8 +556,15 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_trace *ctf_metadata_decoder_get_trace(
+struct bt_private_trace *ctf_metadata_decoder_get_ir_trace(
+		struct ctf_metadata_decoder *mdec)
+{
+	return ctf_visitor_generate_ir_get_ir_trace(mdec->visitor);
+}
+
+BT_HIDDEN
+struct ctf_trace_class *ctf_metadata_decoder_borrow_ctf_trace_class(
 		struct ctf_metadata_decoder *mdec)
 {
-	return ctf_visitor_generate_ir_get_trace(mdec->visitor);
+	return ctf_visitor_generate_ir_borrow_ctf_trace_class(mdec->visitor);
 }