src.ctf.fs: move ctf_fs_file to file.hpp

[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 a0153a9b99509f4637b3b3ebce53dd1fab0ad3de..52e6761b8ab7676d3abf9554b4b3f4b9c3b23041 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -14,33 +14,14 @@
 
 #include <babeltrace2/babeltrace.h>
 
-#include "cpp-common/bt2c/data-len.hpp"
 #include "cpp-common/bt2c/glib-up.hpp"
 #include "cpp-common/bt2c/logging.hpp"
 
-#include "metadata.hpp"
+#include "data-stream-file.hpp"
 #include "plugins/ctf/common/src/metadata/tsdl/decoder.hpp"
 
 extern bool ctf_fs_debug;
 
-struct ctf_fs_file
-{
-    explicit ctf_fs_file(const bt2c::Logger& parentLogger) :
-        logger {parentLogger, "PLUGIN/SRC.CTF.FS/FILE"}
-    {
-    }
-
-    bt2c::Logger logger;
-
-    /* Owned by this */
-    GString *path = nullptr;
-
-    /* Owned by this */
-    FILE *fp = nullptr;
-
-    off_t size = 0;
-};
-
 struct ctf_fs_metadata
 {
     /* Owned by this */
@@ -58,8 +39,15 @@ 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>;
+
     explicit ctf_fs_trace(const bt2c::Logger& parentLogger) :
         logger {parentLogger, "PLUGIN/SRC.CTF.FS/TRACE"}
     {
@@ -73,8 +61,7 @@ struct ctf_fs_trace
     /* Owned by this */
     bt_trace *trace = nullptr;
 
-    /* Array of struct ctf_fs_ds_file_group *, owned by this */
-    GPtrArray *ds_file_groups = nullptr;
+    std::vector<ctf_fs_ds_file_group::UP> ds_file_groups;
 
     /* Owned by this */
     GString *path = nullptr;
@@ -85,6 +72,8 @@ struct ctf_fs_trace
 
 struct ctf_fs_port_data
 {
+    using UP = std::unique_ptr<ctf_fs_port_data>;
+
     /* Weak, belongs to ctf_fs_trace */
     struct ctf_fs_ds_file_group *ds_file_group = nullptr;
 
@@ -108,88 +97,13 @@ struct ctf_fs_component
 
     bt2c::Logger logger;
 
-    /* Array of struct ctf_fs_port_data *, owned by this */
-    GPtrArray *port_data = nullptr;
+    std::vector<ctf_fs_port_data::UP> port_data;
 
-    /* Owned by this */
-    struct ctf_fs_trace *trace = nullptr;
+    ctf_fs_trace::UP trace;
 
     ctf::src::ClkClsCfg clkClsCfg;
 };
 
-struct ctf_fs_ds_index_entry
-{
-    explicit ctf_fs_ds_index_entry(const bt2c::DataLen offsetParam,
-                                   const bt2c::DataLen packetSizeParam) noexcept :
-        offset(offsetParam),
-        packetSize(packetSizeParam)
-    {
-    }
-
-    /* Weak, belongs to ctf_fs_ds_file_info. */
-    const char *path = nullptr;
-
-    /* Position of the packet from the beginning of the file. */
-    bt2c::DataLen offset;
-
-    /* Size of the packet. */
-    bt2c::DataLen packetSize;
-
-    /*
-     * Extracted from the packet context, relative to the respective fields'
-     * mapped clock classes (in cycles).
-     */
-    uint64_t timestamp_begin = 0, timestamp_end = 0;
-
-    /*
-     * Converted from the packet context, relative to the trace's EPOCH
-     * (in ns since EPOCH).
-     */
-    int64_t timestamp_begin_ns = 0, timestamp_end_ns = 0;
-
-    /*
-     * Packet sequence number, or UINT64_MAX if not present in the index.
-     */
-    uint64_t packet_seq_num = 0;
-};
-
-struct ctf_fs_ds_index
-{
-    /* Array of pointer to struct ctf_fs_ds_index_entry. */
-    GPtrArray *entries = nullptr;
-};
-
-struct ctf_fs_ds_file_group
-{
-    /*
-     * 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;
-
-    /* Owned by this */
-    struct ctf_stream_class *sc = nullptr;
-
-    /* Owned by this */
-    bt_stream *stream = nullptr;
-
-    /* Stream (instance) ID; -1ULL means none */
-    uint64_t stream_id = 0;
-
-    /* Weak, belongs to component */
-    struct ctf_fs_trace *ctf_fs_trace = nullptr;
-
-    /*
-     * Owned by this.
-     */
-    struct ctf_fs_ds_index *index = nullptr;
-};
-
 struct ctf_fs_msg_iter_data
 {
     explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :