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

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index 85a9fbe1..c39e79e3 100644
--- a/plugins/ctf/common/metadata/decoder.c
+++ b/plugins/ctf/common/metadata/decoder.c
@@ -20,10 +20,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/compat/memstream-internal.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/compat/uuid-internal.h>
+#include <babeltrace2/compat/memstream-internal.h>
+#include <babeltrace2/babeltrace.h>
 #include <glib.h>
 #include <string.h>
 
@@ -348,8 +348,8 @@ int ctf_metadata_decoder_packetized_file_stream_to_buf(
 
 BT_HIDDEN
 struct ctf_metadata_decoder *ctf_metadata_decoder_create(
-		const struct ctf_metadata_decoder_config *config,
-		const char *name)
+		bt_self_component_source *self_comp,
+		const struct ctf_metadata_decoder_config *config)
 {
 	struct ctf_metadata_decoder *mdec =
 		g_new0(struct ctf_metadata_decoder, 1);
@@ -364,9 +364,8 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 
 	BT_LOGD("Creating CTF metadata decoder: "
 		"clock-class-offset-s=%" PRId64 ", "
-		"clock-class-offset-ns=%" PRId64 ", name=\"%s\"",
-		config->clock_class_offset_s, config->clock_class_offset_ns,
-		name);
+		"clock-class-offset-ns=%" PRId64,
+		config->clock_class_offset_s, config->clock_class_offset_ns);
 
 	if (!mdec) {
 		BT_LOGE_STR("Failed to allocate one CTF metadata decoder.");
@@ -374,7 +373,7 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 	}
 
 	mdec->config = *config;
-	mdec->visitor = ctf_visitor_generate_ir_create(config, name);
+	mdec->visitor = ctf_visitor_generate_ir_create(self_comp, config);
 	if (!mdec->visitor) {
 		BT_LOGE("Failed to create a CTF IR metadata AST visitor: "
 			"mdec-addr=%p", mdec);
@@ -385,10 +384,9 @@ struct ctf_metadata_decoder *ctf_metadata_decoder_create(
 
 	BT_LOGD("Creating CTF metadata decoder: "
 		"clock-class-offset-s=%" PRId64 ", "
-		"clock-class-offset-ns=%" PRId64 ", "
-		"name=\"%s\", addr=%p",
+		"clock-class-offset-ns=%" PRId64 ", addr=%p",
 		config->clock_class_offset_s, config->clock_class_offset_ns,
-		name, mdec);
+		mdec);
 
 end:
 	return mdec;
@@ -514,10 +512,6 @@ 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 */
@@ -556,10 +550,10 @@ end:
 }
 
 BT_HIDDEN
-struct bt_private_trace *ctf_metadata_decoder_get_ir_trace(
+bt_trace_class *ctf_metadata_decoder_get_ir_trace_class(
 		struct ctf_metadata_decoder *mdec)
 {
-	return ctf_visitor_generate_ir_get_ir_trace(mdec->visitor);
+	return ctf_visitor_generate_ir_get_ir_trace_class(mdec->visitor);
 }
 
 BT_HIDDEN