src.ctf.fs: remove ctf_fs_component_create

[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 8db757aaa2b2d6381c907b91f203fbfedea65123..6acbfc5173201a957928c81da485a3e7c6d7c12a 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,11 +23,12 @@ 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;
@@ -36,14 +36,9 @@ struct ctf_fs_metadata
     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"}
@@ -52,8 +47,7 @@ struct ctf_fs_trace
 
     bt2c::Logger logger;
 
-    /* Owned by this */
-    struct ctf_fs_metadata *metadata = nullptr;
+    ctf_fs_metadata::UP metadata;
 
     bt2::Trace::Shared trace;
 
@@ -151,10 +145,6 @@ ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const
 bt_message_iterator_class_seek_beginning_method_status
 ctf_fs_iterator_seek_beginning(bt_self_message_iterator *message_iterator);
 
-/* Create and initialize a new, empty ctf_fs_component. */
-
-ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger);
-
 /*
  * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing
  * the same UUID.
@@ -194,6 +184,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 */