src.ctf.fs: make ctf_fs_make_port_name return std::string

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

diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp
index 52e6761b8ab7676d3abf9554b4b3f4b9c3b23041..5d43b38f5bcaf4a9c3ac346e70a07201da471ce1 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -14,7 +14,6 @@
 
 #include <babeltrace2/babeltrace.h>
 
-#include "cpp-common/bt2c/glib-up.hpp"
 #include "cpp-common/bt2c/logging.hpp"
 
 #include "data-stream-file.hpp"
@@ -24,29 +23,22 @@ extern bool ctf_fs_debug;
 
 struct ctf_fs_metadata
 {
+    using UP = std::unique_ptr<ctf_fs_metadata>;
+
     /* Owned by this */
     ctf_metadata_decoder_up decoder;
 
-    /* Owned by this */
-    bt_trace_class *trace_class = nullptr;
+    bt2::TraceClass::Shared trace_class;
 
     /* Weak (owned by `decoder` above) */
     struct ctf_trace_class *tc = nullptr;
 
-    /* Owned by this */
-    char *text = nullptr;
-
     int bo = 0;
 };
 
-struct ctf_fs_trace_deleter
-{
-    void operator()(ctf_fs_trace *) noexcept;
-};
-
 struct ctf_fs_trace
 {
-    using UP = std::unique_ptr<ctf_fs_trace, ctf_fs_trace_deleter>;
+    using UP = std::unique_ptr<ctf_fs_trace>;
 
     explicit ctf_fs_trace(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.FS/TRACE"}
@@ -55,16 +47,13 @@ struct ctf_fs_trace
 
     bt2c::Logger logger;
 
-    /* Owned by this */
-    struct ctf_fs_metadata *metadata = nullptr;
+    ctf_fs_metadata::UP metadata;
 
-    /* Owned by this */
-    bt_trace *trace = nullptr;
+    bt2::Trace::Shared trace;
 
     std::vector<ctf_fs_ds_file_group::UP> ds_file_groups;
 
-    /* Owned by this */
-    GString *path = nullptr;
+    std::string path;
 
     /* Next automatic stream ID when not provided by packet header */
     uint64_t next_stream_id = 0;
@@ -81,14 +70,9 @@ struct ctf_fs_port_data
     struct ctf_fs_component *ctf_fs = nullptr;
 };
 
-struct ctf_fs_component_deleter
-{
-    void operator()(ctf_fs_component *);
-};
-
 struct ctf_fs_component
 {
-    using UP = std::unique_ptr<ctf_fs_component, ctf_fs_component_deleter>;
+    using UP = std::unique_ptr<ctf_fs_component>;
 
     explicit ctf_fs_component(const bt2c::Logger& parentLogger) noexcept :
         logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"}
@@ -106,6 +90,8 @@ struct ctf_fs_component
 
 struct ctf_fs_msg_iter_data
 {
+    using UP = std::unique_ptr<ctf_fs_msg_iter_data>;
+
     explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
         self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
                                              "PLUGIN/SRC.CTF.FS/MSG-ITER"}
@@ -120,8 +106,7 @@ struct ctf_fs_msg_iter_data
     /* Weak, belongs to ctf_fs_trace */
     struct ctf_fs_ds_file_group *ds_file_group = nullptr;
 
-    /* Owned by this */
-    struct ctf_msg_iter *msg_iter = nullptr;
+    ctf_msg_iter_up msg_iter;
 
     /*
      * Saved error.  If we hit an error in the _next method, but have some
@@ -132,7 +117,7 @@ struct ctf_fs_msg_iter_data
         BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
     const struct bt_error *next_saved_error = nullptr;
 
-    struct ctf_fs_ds_group_medops_data *msg_iter_medops_data = nullptr;
+    ctf_fs_ds_group_medops_data_up msg_iter_medops_data;
 };
 
 bt_component_class_initialize_method_status
@@ -181,10 +166,6 @@ int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs,
                                          const bt_value *trace_name_value,
                                          bt_self_component *selfComp);
 
-/* Free `ctf_fs` and everything it owns. */
-
-void ctf_fs_destroy(struct ctf_fs_component *ctf_fs);
-
 /*
  * Read and validate parameters taken by the src.ctf.fs plugin.
  *
@@ -207,6 +188,6 @@ bool read_src_fs_parameters(const bt_value *params, const bt_value **paths,
  * Generate the port name to be used for a given data stream file group.
  */
 
-bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group);
+std::string ctf_fs_make_port_name(ctf_fs_ds_file_group *ds_file_group);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */