src.ctf.fs: make ctf_fs_trace::trace a bt2::Trace::Shared

[babeltrace.git] / src / plugins / ctf / fs-src / fs.cpp

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index d6d6bf5349ba8e248711520956ef07ed7423308c..bd0e24b894474a2cbf576d8eb6d645a89d157340 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -35,15 +35,6 @@ struct tracer_info
     int64_t patch;
 };
 
-static void ctf_fs_msg_iter_data_destroy(struct ctf_fs_msg_iter_data *msg_iter_data)
-{
-    if (!msg_iter_data) {
-        return;
-    }
-
-    delete msg_iter_data;
-}
-
 static bt_message_iterator_class_next_method_status
 ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg)
 {
@@ -176,8 +167,8 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it)
 
 void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
 {
-    ctf_fs_msg_iter_data_destroy(
-        (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it));
+    ctf_fs_msg_iter_data::UP {
+        (static_cast<ctf_fs_msg_iter_data *>(bt_self_message_iterator_get_data(it)))};
 }
 
 static bt_message_iterator_class_initialize_method_status
@@ -211,7 +202,7 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter,
             bt_self_component_port_output_as_self_component_port(self_port));
         BT_ASSERT(port_data);
 
-        ctf_fs_msg_iter_data *msg_iter_data = new ctf_fs_msg_iter_data {self_msg_iter};
+        auto msg_iter_data = bt2s::make_unique<ctf_fs_msg_iter_data>(self_msg_iter);
         msg_iter_data->ds_file_group = port_data->ds_file_group;
 
         medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group,
@@ -247,8 +238,7 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter,
             bt_self_message_iterator_configuration_set_can_seek_forward(config, true);
         }
 
-        bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data);
-        msg_iter_data = NULL;
+        bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release());
 
         status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
         goto end;
@@ -257,7 +247,6 @@ error:
         bt_self_message_iterator_set_data(self_msg_iter, NULL);
 
 end:
-        ctf_fs_msg_iter_data_destroy(msg_iter_data);
         return status;
     } catch (const std::bad_alloc&) {
         return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
@@ -272,8 +261,6 @@ static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
         return;
     }
 
-    BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace);
-
     if (ctf_fs_trace->path) {
         g_string_free(ctf_fs_trace->path, TRUE);
     }
@@ -776,19 +763,22 @@ static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name,
     }
 
     if (ctf_fs_trace->metadata->trace_class) {
-        ctf_fs_trace->trace = bt_trace_create(ctf_fs_trace->metadata->trace_class);
-        if (!ctf_fs_trace->trace) {
+        bt_trace *trace = bt_trace_create(ctf_fs_trace->metadata->trace_class);
+        if (!trace) {
             goto error;
         }
+
+        ctf_fs_trace->trace = bt2::Trace::Shared::createWithoutRef(trace);
     }
 
     if (ctf_fs_trace->trace) {
-        ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, ctf_fs_trace->trace);
+        ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc,
+                                                 ctf_fs_trace->trace->libObjPtr());
         if (ret) {
             goto error;
         }
 
-        ret = set_trace_name(ctf_fs_trace->trace, name, ctf_fs_trace->logger);
+        ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name, ctf_fs_trace->logger);
         if (ret) {
             goto error;
         }
@@ -1794,13 +1784,15 @@ static int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace)
 
         if (ds_file_group->stream_id == UINT64_C(-1)) {
             /* No stream ID: use 0 */
-            stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace,
-                                              ctf_fs_trace->next_stream_id);
+            stream =
+                bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace->libObjPtr(),
+                                         ctf_fs_trace->next_stream_id);
             ctf_fs_trace->next_stream_id++;
         } else {
             /* Specific stream ID */
-            stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace,
-                                              (uint64_t) ds_file_group->stream_id);
+            stream =
+                bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace->libObjPtr(),
+                                         (uint64_t) ds_file_group->stream_id);
         }
 
         if (!stream) {