src.ctf.fs: make ctf_fs_ds_index_create return a unique_ptr

[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 54c484a61a96ad54d9e47ac8b70d7eb2ed98dc55..a87877caf319e1d08bf7007cdf6730e310c5c181 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -8,6 +8,8 @@
 #define CTF_FS_DS_FILE_H
 
 #include <memory>
+#include <string>
+#include <vector>
 
 #include <glib.h>
 #include <stdio.h>
@@ -21,8 +23,9 @@
 
 struct ctf_fs_ds_file_info
 {
-    /* Owned by this. */
-    GString *path = nullptr;
+    using UP = std::unique_ptr<ctf_fs_ds_file_info>;
+
+    std::string path;
 
     /* Guaranteed to be set, as opposed to the index. */
     int64_t begin_ns = 0;
@@ -103,8 +106,15 @@ 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;
 };
@@ -119,15 +129,13 @@ struct ctf_fs_ds_file_group
     using UP = std::unique_ptr<ctf_fs_ds_file_group, ctf_fs_ds_file_group_deleter>;
 
     /*
-     * Array of struct ctf_fs_ds_file_info, owned by this.
-     *
      * This is an _ordered_ array of data stream file infos which
      * belong to this group (a single stream instance).
      *
      * You can call ctf_fs_ds_file_create() with one of those paths
      * and the trace IR stream below.
      */
-    GPtrArray *ds_file_infos = nullptr;
+    std::vector<ctf_fs_ds_file_info::UP> ds_file_infos;
 
     /* Owned by this */
     struct ctf_stream_class *sc = nullptr;
@@ -152,25 +160,21 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(struct ctf_fs_trace *ctf_fs_trace,
 
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
-struct ctf_fs_ds_index *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_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);
 
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(const bt2c::Logger& logger);
+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);
 
-void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info);
-
-struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns);
+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);
 
-void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group);
-
 /*
  * Medium operations to iterate on a single ctf_fs_ds_file.
  *