src.ctf.fs: make ctf_fs_ds_file_info_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 0b6a95afadf8d98a23e0b48c745fb7015da4e97d..86cc218b854e7f1e31e5596f049fb21cf80cc576 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.hpp
+++ b/src/plugins/ctf/fs-src/data-stream-file.hpp
@@ -7,6 +7,9 @@
 #ifndef CTF_FS_DS_FILE_H
 #define CTF_FS_DS_FILE_H
 
+#include <memory>
+#include <string>
+
 #include <glib.h>
 #include <stdio.h>
 
@@ -19,8 +22,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;
@@ -107,8 +111,15 @@ struct ctf_fs_ds_index
     GPtrArray *entries = nullptr;
 };
 
+struct ctf_fs_ds_file_group_deleter
+{
+    void operator()(struct ctf_fs_ds_file_group *group) noexcept;
+};
+
 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.
      *
@@ -153,14 +164,12 @@ 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);
-
-struct ctf_fs_ds_file_group *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_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns);
 
-void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group);
+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);
 
 /*
  * Medium operations to iterate on a single ctf_fs_ds_file.