src.ctf.fs: make ctf_fs_ds_file::stream a bt2::Stream::Shared

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

diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp
index a87877caf319e1d08bf7007cdf6730e310c5c181..bdbf477d88c278d3ac25e5fc354cc8607d798612 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -16,6 +16,7 @@
 
 #include <babeltrace2/babeltrace.h>
 
+#include "cpp-common/bt2/trace-ir.hpp"
 #include "cpp-common/bt2c/data-len.hpp"
 #include "cpp-common/bt2c/logging.hpp"
 
@@ -46,8 +47,7 @@ struct ctf_fs_ds_file
     /* Owned by this */
     struct ctf_fs_file *file = nullptr;
 
-    /* Owned by this */
-    bt_stream *stream = nullptr;
+    bt2::Stream::Shared stream;
 
     void *mmap_addr = nullptr;
 
@@ -72,6 +72,8 @@ struct ctf_fs_ds_file
 
 struct ctf_fs_ds_index_entry
 {
+    using UP = std::unique_ptr<ctf_fs_ds_index_entry>;
+
     explicit ctf_fs_ds_index_entry(const bt2c::DataLen offsetParam,
                                    const bt2c::DataLen packetSizeParam) noexcept :
         offset(offsetParam),
@@ -106,27 +108,16 @@ struct ctf_fs_ds_index_entry
     uint64_t packet_seq_num = 0;
 };
 
-struct ctf_fs_ds_index_deleter
-{
-    void operator()(struct ctf_fs_ds_index *index) noexcept;
-};
-
 struct ctf_fs_ds_index
 {
-    using UP = std::unique_ptr<ctf_fs_ds_index, ctf_fs_ds_index_deleter>;
-
-    /* Array of pointer to struct ctf_fs_ds_index_entry. */
-    GPtrArray *entries = nullptr;
-};
+    using UP = std::unique_ptr<ctf_fs_ds_index>;
 
-struct ctf_fs_ds_file_group_deleter
-{
-    void operator()(struct ctf_fs_ds_file_group *group) noexcept;
+    std::vector<ctf_fs_ds_index_entry::UP> entries;
 };
 
 struct ctf_fs_ds_file_group
 {
-    using UP = std::unique_ptr<ctf_fs_ds_file_group, ctf_fs_ds_file_group_deleter>;
+    using UP = std::unique_ptr<ctf_fs_ds_file_group>;
 
     /*
      * This is an _ordered_ array of data stream file infos which
@@ -140,8 +131,7 @@ struct ctf_fs_ds_file_group
     /* Owned by this */
     struct ctf_stream_class *sc = nullptr;
 
-    /* Owned by this */
-    bt_stream *stream = nullptr;
+    bt2::Stream::Shared stream;
 
     /* Stream (instance) ID; -1ULL means none */
     uint64_t stream_id = 0;
@@ -149,13 +139,10 @@ struct ctf_fs_ds_file_group
     /* Weak, belongs to component */
     struct ctf_fs_trace *ctf_fs_trace = nullptr;
 
-    /*
-     * Owned by this.
-     */
-    struct ctf_fs_ds_index *index = nullptr;
+    ctf_fs_ds_index::UP index;
 };
 
-struct ctf_fs_ds_file *ctf_fs_ds_file_create(struct ctf_fs_trace *ctf_fs_trace, bt_stream *stream,
+struct ctf_fs_ds_file *ctf_fs_ds_file_create(ctf_fs_trace *ctf_fs_trace, bt2::Stream::Shared stream,
                                              const char *path, const bt2c::Logger& logger);
 
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
@@ -164,16 +151,14 @@ ctf_fs_ds_index::UP ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_file,
                                                struct ctf_fs_ds_file_info *ds_file_info,
                                                struct ctf_msg_iter *msg_iter);
 
-ctf_fs_ds_index::UP ctf_fs_ds_index_create(const bt2c::Logger& logger);
-
-void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
+ctf_fs_ds_index::UP ctf_fs_ds_index_create();
 
 ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns);
 
 ctf_fs_ds_file_group::UP ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs_trace,
                                                      struct ctf_stream_class *sc,
                                                      uint64_t stream_instance_id,
-                                                     struct ctf_fs_ds_index *index);
+                                                     ctf_fs_ds_index::UP index);
 
 /*
  * Medium operations to iterate on a single ctf_fs_ds_file.