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

[babeltrace.git] / src / plugins / ctf / lttng-live / metadata.cpp

diff --git a/src/plugins/ctf/lttng-live/metadata.cpp b/src/plugins/ctf/lttng-live/metadata.cpp
index 6aaa7beb68f8037ff463ecad3831e4ebbe891cb1..db8ba37711f737a75c857b7aa0eed39aaf8c39c3 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.cpp
+++ b/src/plugins/ctf/lttng-live/metadata.cpp
@@ -226,14 +226,16 @@ enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_tra
      * new metadata to our current trace class.
      */
     BT_CPPLOGD_SPEC(metadata->logger, "Appending new metadata to the ctf_trace class");
-    decoder_status = ctf_metadata_decoder_append_content(metadata->decoder, fp);
+    decoder_status = ctf_metadata_decoder_append_content(metadata->decoder.get(), fp);
     switch (decoder_status) {
     case CTF_METADATA_DECODER_STATUS_OK:
         if (!trace->trace_class) {
             struct ctf_trace_class *tc =
-                ctf_metadata_decoder_borrow_ctf_trace_class(metadata->decoder);
+                ctf_metadata_decoder_borrow_ctf_trace_class(metadata->decoder.get());
 
-            trace->trace_class = ctf_metadata_decoder_get_ir_trace_class(metadata->decoder);
+            trace->trace_class = ctf_metadata_decoder_get_ir_trace_class(metadata->decoder.get())
+                                     .release()
+                                     .libObjPtr();
             trace->trace = bt_trace_create(trace->trace_class);
             if (!trace->trace) {
                 BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger, "Failed to create bt_trace");
@@ -284,8 +286,6 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session, uint64
 
     ctf_metadata_decoder_config cfg {session->logger};
     cfg.self_comp = session->self_comp;
-    cfg.clock_class_offset_s = 0;
-    cfg.clock_class_offset_ns = 0;
     cfg.create_trace_class = true;
 
     lttng_live_metadata *metadata = new lttng_live_metadata {session->logger};
@@ -305,7 +305,6 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session, uint64
     return 0;
 
 error:
-    ctf_metadata_decoder_destroy(metadata->decoder);
     delete metadata;
     return -1;
 }
@@ -317,7 +316,6 @@ void lttng_live_metadata_fini(struct lttng_live_trace *trace)
     if (!metadata) {
         return;
     }
-    ctf_metadata_decoder_destroy(metadata->decoder);
     trace->metadata = NULL;
     delete metadata;
 }