#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 */
/* Weak (owned by `decoder` above) */
struct ctf_trace_class *tc = nullptr;
- /* Owned by this */
- char *text = nullptr;
-
int bo = 0;
};
/* Owned by this */
struct ctf_fs_metadata *metadata = nullptr;
- /* Owned by this */
- bt_trace *trace = nullptr;
+ bt2::Trace::Shared trace;
- /* 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;
+ std::string path;
/* Next automatic stream ID when not provided by packet header */
uint64_t next_stream_id = 0;
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<ctf_fs_component, ctf_fs_component_deleter>;
+ using UP = std::unique_ptr<ctf_fs_component>;
explicit ctf_fs_component(const bt2c::Logger& parentLogger) noexcept :
logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"}
struct ctf_fs_msg_iter_data
{
+ using UP = std::unique_ptr<ctf_fs_msg_iter_data>;
+
explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
"PLUGIN/SRC.CTF.FS/MSG-ITER"}
/* Weak, belongs to ctf_fs_trace */
struct ctf_fs_ds_file_group *ds_file_group = nullptr;
- /* Owned by this */
- struct ctf_msg_iter *msg_iter = nullptr;
+ ctf_msg_iter_up msg_iter;
/*
* Saved error. If we hit an error in the _next method, but have some
BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
const struct bt_error *next_saved_error = nullptr;
- struct ctf_fs_ds_group_medops_data *msg_iter_medops_data = nullptr;
+ ctf_fs_ds_group_medops_data_up msg_iter_medops_data;
};
bt_component_class_initialize_method_status
const bt_value *trace_name_value,
bt_self_component *selfComp);
-/* Free `ctf_fs` and everything it owns. */
-
-void ctf_fs_destroy(struct ctf_fs_component *ctf_fs);
-
/*
* Read and validate parameters taken by the src.ctf.fs plugin.
*