tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / ctf / common / metadata / decoder.c

diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c
index 814da165eb316f0db73c8803d66b37e4de63b7c9..c39e79e36ec9ad4c5d58bcaa7f44a060ee54b702 100644 (file)
--- 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 <assert.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;
@@ -417,7 +415,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 +493,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: "
@@ -552,8 +550,15 @@ end:
 }
 
 BT_HIDDEN
-struct bt_ctf_trace *ctf_metadata_decoder_get_trace(
+bt_trace_class *ctf_metadata_decoder_get_ir_trace_class(
+               struct ctf_metadata_decoder *mdec)
+{
+       return ctf_visitor_generate_ir_get_ir_trace_class(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);
 }