src.ctf.fs: make ctf_visitor_generate_ir::trace_class a bt2::TraceClass::Shared

[babeltrace.git] / src / plugins / ctf / common / src / metadata / tsdl / decoder.cpp

diff --git a/src/plugins/ctf/common/src/metadata/tsdl/decoder.cpp b/src/plugins/ctf/common/src/metadata/tsdl/decoder.cpp
index 739c648b278a10937f65c26741c2caebc6adf11a..7e5e8bb117532548be037d290588b0fa8e111651 100644 (file)
--- a/src/plugins/ctf/common/src/metadata/tsdl/decoder.cpp
+++ b/src/plugins/ctf/common/src/metadata/tsdl/decoder.cpp
@@ -86,16 +86,15 @@ end:
     return ret;
 }
 
-struct ctf_metadata_decoder *
+ctf_metadata_decoder_up
 ctf_metadata_decoder_create(const struct ctf_metadata_decoder_config *config)
 {
     BT_ASSERT(config);
-
     BT_CPPLOGD_SPEC(config->logger,
                     "Creating CTF metadata decoder: "
                     "clock-class-offset-s={}, "
                     "clock-class-offset-ns={}",
-                    config->clock_class_offset_s, config->clock_class_offset_ns);
+                    config->clkClsCfg.offsetSec, config->clkClsCfg.offsetNanoSec);
 
     ctf_metadata_decoder *mdec = new ctf_metadata_decoder {config->logger};
     mdec->scanner = ctf_scanner_alloc(mdec->logger);
@@ -131,7 +130,7 @@ ctf_metadata_decoder_create(const struct ctf_metadata_decoder_config *config)
                     "Creating CTF metadata decoder: "
                     "clock-class-offset-s={}, "
                     "clock-class-offset-ns={}, addr={}",
-                    config->clock_class_offset_s, config->clock_class_offset_ns, fmt::ptr(mdec));
+                    config->clkClsCfg.offsetSec, config->clkClsCfg.offsetNanoSec, fmt::ptr(mdec));
     goto end;
 
 error:
@@ -139,7 +138,7 @@ error:
     mdec = NULL;
 
 end:
-    return mdec;
+    return ctf_metadata_decoder_up {mdec};
 }
 
 void ctf_metadata_decoder_destroy(struct ctf_metadata_decoder *mdec)
@@ -161,6 +160,11 @@ void ctf_metadata_decoder_destroy(struct ctf_metadata_decoder *mdec)
     delete mdec;
 }
 
+void ctf_metadata_decoder_deleter::operator()(ctf_metadata_decoder *decoder)
+{
+    ctf_metadata_decoder_destroy(decoder);
+}
+
 enum ctf_metadata_decoder_status
 ctf_metadata_decoder_append_content(struct ctf_metadata_decoder *mdec, FILE *fp)
 {
@@ -357,7 +361,7 @@ end:
     return status;
 }
 
-bt_trace_class *ctf_metadata_decoder_get_ir_trace_class(struct ctf_metadata_decoder *mdec)
+bt2::TraceClass::Shared ctf_metadata_decoder_get_ir_trace_class(struct ctf_metadata_decoder *mdec)
 {
     BT_ASSERT_DBG(mdec);
     BT_ASSERT_DBG(mdec->config.create_trace_class);