X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.hpp;h=f80368addc8d09f2c87aed35511a9f9eefff16c7;hb=0f5c5d5ce30884c93b4e4d0662e2914029c3e90f;hp=0efb203937ccd78160c3067b474c11148ffc4565;hpb=50b9f4b57b59dd9524a6c463c64470b2aac9c429;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp index 0efb2039..f80368ad 100644 --- a/src/plugins/ctf/fs-src/fs.hpp +++ b/src/plugins/ctf/fs-src/fs.hpp @@ -10,122 +10,127 @@ #ifndef BABELTRACE_PLUGIN_CTF_FS_H #define BABELTRACE_PLUGIN_CTF_FS_H -#include -#include "common/macros.h" +#include + #include -#include "data-stream-file.hpp" + +#include "cpp-common/bt2c/logging.hpp" + #include "metadata.hpp" -#include "../common/metadata/decoder.hpp" extern bool ctf_fs_debug; struct ctf_fs_file { - bt_logging_level log_level; + explicit ctf_fs_file(const bt2c::Logger& parentLogger) : + logger {parentLogger, "PLUGIN/SRC.CTF.FS/FILE"} + { + } - /* Weak */ - bt_self_component *self_comp; + bt2c::Logger logger; /* Owned by this */ - GString *path; + GString *path = nullptr; /* Owned by this */ - FILE *fp; + FILE *fp = nullptr; - off_t size; + off_t size = 0; }; struct ctf_fs_metadata { /* Owned by this */ - struct ctf_metadata_decoder *decoder; + struct ctf_metadata_decoder *decoder = nullptr; /* Owned by this */ - bt_trace_class *trace_class; + bt_trace_class *trace_class = nullptr; /* Weak (owned by `decoder` above) */ - struct ctf_trace_class *tc; + struct ctf_trace_class *tc = nullptr; /* Owned by this */ - char *text; + char *text = nullptr; - int bo; + int bo = 0; }; struct ctf_fs_component { - bt_logging_level log_level; + 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; + GPtrArray *port_data = nullptr; /* Owned by this */ - struct ctf_fs_trace *trace; + struct ctf_fs_trace *trace = nullptr; struct ctf_fs_metadata_config metadata_config; }; struct ctf_fs_trace { - bt_logging_level log_level; + explicit ctf_fs_trace(const bt2c::Logger& parentLogger) : + logger {parentLogger, "PLUGIN/SRC.CTF.FS/TRACE"} + { + } - /* - * Weak. These are mostly used to generate log messages or to append - * error causes. They are mutually exclusive, only one of them must be - * set. - */ - bt_self_component *self_comp; - bt_self_component_class *self_comp_class; + bt2c::Logger logger; /* Owned by this */ - struct ctf_fs_metadata *metadata; + struct ctf_fs_metadata *metadata = nullptr; /* Owned by this */ - bt_trace *trace; + bt_trace *trace = nullptr; /* Array of struct ctf_fs_ds_file_group *, owned by this */ - GPtrArray *ds_file_groups; + GPtrArray *ds_file_groups = nullptr; /* Owned by this */ - GString *path; + GString *path = nullptr; /* Next automatic stream ID when not provided by packet header */ - uint64_t next_stream_id; + uint64_t next_stream_id = 0; }; struct ctf_fs_ds_index_entry { /* Weak, belongs to ctf_fs_ds_file_info. */ - const char *path; + const char *path = nullptr; /* Position, in bytes, of the packet from the beginning of the file. */ - uint64_t offset; + uint64_t offset = 0; /* Size of the packet, in bytes. */ - uint64_t packet_size; + uint64_t packet_size = 0; /* * Extracted from the packet context, relative to the respective fields' * mapped clock classes (in cycles). */ - uint64_t timestamp_begin, timestamp_end; + 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, timestamp_end_ns; + 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; + uint64_t packet_seq_num = 0; }; struct ctf_fs_ds_index { /* Array of pointer to struct ctf_fs_ds_index_entry. */ - GPtrArray *entries; + GPtrArray *entries = nullptr; }; struct ctf_fs_ds_file_group @@ -139,60 +144,64 @@ struct ctf_fs_ds_file_group * You can call ctf_fs_ds_file_create() with one of those paths * and the trace IR stream below. */ - GPtrArray *ds_file_infos; + GPtrArray *ds_file_infos = nullptr; /* Owned by this */ - struct ctf_stream_class *sc; + struct ctf_stream_class *sc = nullptr; /* Owned by this */ - bt_stream *stream; + bt_stream *stream = nullptr; /* Stream (instance) ID; -1ULL means none */ - uint64_t stream_id; + uint64_t stream_id = 0; /* Weak, belongs to component */ - struct ctf_fs_trace *ctf_fs_trace; + struct ctf_fs_trace *ctf_fs_trace = nullptr; /* * Owned by this. */ - struct ctf_fs_ds_index *index; + 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; + struct ctf_fs_ds_file_group *ds_file_group = nullptr; /* Weak */ - struct ctf_fs_component *ctf_fs; + struct ctf_fs_component *ctf_fs = nullptr; }; struct ctf_fs_msg_iter_data { - bt_logging_level log_level; + 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 */ - bt_self_component *self_comp; + bt_self_message_iterator *self_msg_iter = nullptr; - /* Weak */ - bt_self_message_iterator *self_msg_iter; + bt2c::Logger logger; /* Weak, belongs to ctf_fs_trace */ - struct ctf_fs_ds_file_group *ds_file_group; + struct ctf_fs_ds_file_group *ds_file_group = nullptr; /* Owned by this */ - struct ctf_msg_iter *msg_iter; + struct ctf_msg_iter *msg_iter = nullptr; /* * Saved error. If we hit an error in the _next method, but have some * messages ready to return, we save the error here and return it on * the next _next call. */ - bt_message_iterator_class_next_method_status next_saved_status; - const struct bt_error *next_saved_error; + bt_message_iterator_class_next_method_status next_saved_status = + 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; + struct ctf_fs_ds_group_medops_data *msg_iter_medops_data = nullptr; }; bt_component_class_initialize_method_status @@ -222,7 +231,7 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *message_iterator); /* Create and initialize a new, empty ctf_fs_component. */ -struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level); +ctf_fs_component *ctf_fs_component_create(const bt2c::Logger& parentLogger); /* * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing @@ -239,8 +248,7 @@ struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level); int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs, const bt_value *paths_value, const bt_value *trace_name_value, - bt_self_component *self_comp, - bt_self_component_class *self_comp_class); + bt_self_component *selfComp); /* Free `ctf_fs` and everything it owns. */ @@ -262,8 +270,7 @@ void ctf_fs_destroy(struct ctf_fs_component *ctf_fs); */ bool read_src_fs_parameters(const bt_value *params, const bt_value **paths, - const bt_value **trace_name, struct ctf_fs_component *ctf_fs, - bt_self_component *self_comp, bt_self_component_class *self_comp_class); + const bt_value **trace_name, struct ctf_fs_component *ctf_fs); /* * Generate the port name to be used for a given data stream file group.