From 09721481dadde68a4b1e031051dc21826d16c822 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 12 Dec 2023 04:39:00 +0000 Subject: [PATCH] src.ctf.fs: move struct ctf_fs_trace and struct ctf_fs_port_data up Move them so they are before ctf_fs_component. This enables the following patches to use a unique_ptr to hold them in ctf_fs_component. Change-Id: If97956d0c74795f8ee18ecebe035c8b186d85a2b Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8239 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12278 --- src/plugins/ctf/fs-src/fs.hpp | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp index 4446524c..a0153a9b 100644 --- a/src/plugins/ctf/fs-src/fs.hpp +++ b/src/plugins/ctf/fs-src/fs.hpp @@ -58,31 +58,6 @@ struct ctf_fs_metadata int bo = 0; }; -struct ctf_fs_component_deleter -{ - void operator()(struct ctf_fs_component *); -}; - -struct ctf_fs_component -{ - using UP = std::unique_ptr; - - 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; -}; - struct ctf_fs_trace { explicit ctf_fs_trace(const bt2c::Logger& parentLogger) : @@ -108,6 +83,40 @@ struct ctf_fs_trace uint64_t next_stream_id = 0; }; +struct ctf_fs_port_data +{ + /* Weak, belongs to ctf_fs_trace */ + struct ctf_fs_ds_file_group *ds_file_group = nullptr; + + /* Weak */ + struct ctf_fs_component *ctf_fs = nullptr; +}; + +struct ctf_fs_component_deleter +{ + void operator()(ctf_fs_component *); +}; + +struct ctf_fs_component +{ + using UP = std::unique_ptr; + + explicit ctf_fs_component(const bt2c::Logger& parentLogger) noexcept : + 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; +}; + struct ctf_fs_ds_index_entry { explicit ctf_fs_ds_index_entry(const bt2c::DataLen offsetParam, @@ -181,15 +190,6 @@ struct ctf_fs_ds_file_group struct ctf_fs_ds_index *index = nullptr; }; -struct ctf_fs_port_data -{ - /* Weak, belongs to ctf_fs_trace */ - struct ctf_fs_ds_file_group *ds_file_group = nullptr; - - /* Weak */ - struct ctf_fs_component *ctf_fs = nullptr; -}; - struct ctf_fs_msg_iter_data { explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) : -- 2.34.1