src.ctf.fs: make ctf_fs_component::port_data a vector

[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 7aa4568e0a5a9f8fdaa21462e8f9e09ae9ffd6bd..a270304ab1299a1cbe0cd6094006feb62fad6948 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -57,33 +57,15 @@ struct ctf_fs_metadata
     int bo = 0;
 };
 
-struct ctf_fs_component_deleter
+struct ctf_fs_trace_deleter
 {
-    void operator()(struct ctf_fs_component *);
-};
-
-struct ctf_fs_component
-{
-    using UP = std::unique_ptr<ctf_fs_component, ctf_fs_component_deleter>;
-
-    explicit ctf_fs_component(const bt2c::Logger& parentLogger) :
-        logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"}
-    {
-    }
-
-    bt2c::Logger logger;
-
-    /* Array of struct ctf_fs_port_data *, owned by this */
-    GPtrArray *port_data = nullptr;
-
-    /* Owned by this */
-    struct ctf_fs_trace *trace = nullptr;
-
-    ctf::src::ClkClsCfg clkClsCfg;
+    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"}
     {
@@ -107,79 +89,38 @@ struct ctf_fs_trace
     uint64_t next_stream_id = 0;
 };
 
-struct ctf_fs_ds_index_entry
+struct ctf_fs_port_data
 {
-    /* Weak, belongs to ctf_fs_ds_file_info. */
-    const char *path = nullptr;
-
-    /* Position, in bytes, of the packet from the beginning of the file. */
-    uint64_t offset = 0;
-
-    /* Size of the packet, in bytes. */
-    uint64_t packet_size = 0;
+    using UP = std::unique_ptr<ctf_fs_port_data>;
 
-    /*
-     * 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;
+    /* Weak, belongs to ctf_fs_trace */
+    struct ctf_fs_ds_file_group *ds_file_group = nullptr;
 
-    /*
-     * Packet sequence number, or UINT64_MAX if not present in the index.
-     */
-    uint64_t packet_seq_num = 0;
+    /* Weak */
+    struct ctf_fs_component *ctf_fs = nullptr;
 };
 
-struct ctf_fs_ds_index
+struct ctf_fs_component_deleter
 {
-    /* Array of pointer to struct ctf_fs_ds_index_entry. */
-    GPtrArray *entries = nullptr;
+    void operator()(ctf_fs_component *);
 };
 
-struct ctf_fs_ds_file_group
+struct ctf_fs_component
 {
-    /*
-     * 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;
+    using UP = std::unique_ptr<ctf_fs_component, ctf_fs_component_deleter>;
 
-    /* Stream (instance) ID; -1ULL means none */
-    uint64_t stream_id = 0;
+    explicit ctf_fs_component(const bt2c::Logger& parentLogger) noexcept :
+        logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"}
+    {
+    }
 
-    /* Weak, belongs to component */
-    struct ctf_fs_trace *ctf_fs_trace = nullptr;
+    bt2c::Logger logger;
 
-    /*
-     * Owned by this.
-     */
-    struct ctf_fs_ds_index *index = nullptr;
-};
+    std::vector<ctf_fs_port_data::UP> port_data;
 
-struct ctf_fs_port_data
-{
-    /* Weak, belongs to ctf_fs_trace */
-    struct ctf_fs_ds_file_group *ds_file_group = nullptr;
+    ctf_fs_trace::UP trace;
 
-    /* Weak */
-    struct ctf_fs_component *ctf_fs = nullptr;
+    ctf::src::ClkClsCfg clkClsCfg;
 };
 
 struct ctf_fs_msg_iter_data