X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.hpp;h=c9ca2a90be0dd093086a89c6ced1f38d3eaedfa7;hb=HEAD;hp=f2ff5fcc145beea5092f1026598ce249072399fc;hpb=cdf7de787676e68fbd55a5dedc4d54bfcbf7aa7d;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp index f2ff5fcc..4f7837d6 100644 --- a/src/plugins/ctf/fs-src/fs.hpp +++ b/src/plugins/ctf/fs-src/fs.hpp @@ -7,14 +7,13 @@ * BabelTrace - CTF on File System Component */ -#ifndef BABELTRACE_PLUGIN_CTF_FS_H -#define BABELTRACE_PLUGIN_CTF_FS_H +#ifndef BABELTRACE_PLUGINS_CTF_FS_SRC_FS_HPP +#define BABELTRACE_PLUGINS_CTF_FS_SRC_FS_HPP #include #include -#include "cpp-common/bt2c/glib-up.hpp" #include "cpp-common/bt2c/logging.hpp" #include "data-stream-file.hpp" @@ -22,49 +21,24 @@ 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 { + using UP = std::unique_ptr; + /* Owned by this */ ctf_metadata_decoder_up decoder; - /* Owned by this */ - bt_trace_class *trace_class = nullptr; + bt2::TraceClass::Shared trace_class; /* Weak (owned by `decoder` above) */ struct ctf_trace_class *tc = nullptr; - /* Owned by this */ - char *text = nullptr; - int bo = 0; }; -struct ctf_fs_trace_deleter -{ - void operator()(ctf_fs_trace *) noexcept; -}; - struct ctf_fs_trace { - using UP = std::unique_ptr; + using UP = std::unique_ptr; explicit ctf_fs_trace(const bt2c::Logger& parentLogger) : logger {parentLogger, "PLUGIN/SRC.CTF.FS/TRACE"} @@ -73,16 +47,13 @@ struct ctf_fs_trace bt2c::Logger logger; - /* Owned by this */ - struct ctf_fs_metadata *metadata = nullptr; + ctf_fs_metadata::UP metadata; - /* Owned by this */ - bt_trace *trace = nullptr; + bt2::Trace::Shared trace; std::vector 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; @@ -99,17 +70,14 @@ struct ctf_fs_port_data 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; + using UP = std::unique_ptr; - explicit ctf_fs_component(const bt2c::Logger& parentLogger) noexcept : - logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"} + explicit ctf_fs_component(const ctf::src::ClkClsCfg& clkClsCfgParam, + const bt2c::Logger& parentLogger) noexcept : + logger {parentLogger, "PLUGIN/SRC.CTF.FS/COMP"}, + clkClsCfg {clkClsCfgParam} { } @@ -124,9 +92,11 @@ struct ctf_fs_component struct ctf_fs_msg_iter_data { + using UP = std::unique_ptr; + 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"} + self_msg_iter {selfMsgIter}, + logger {bt2::SelfMessageIterator {self_msg_iter}, "PLUGIN/SRC.CTF.FS/MSG-ITER"} { } @@ -138,8 +108,7 @@ struct ctf_fs_msg_iter_data /* 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 @@ -150,7 +119,7 @@ struct ctf_fs_msg_iter_data 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 @@ -178,10 +147,6 @@ ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const bt_message_iterator_class_seek_beginning_method_status ctf_fs_iterator_seek_beginning(bt_self_message_iterator *message_iterator); -/* Create and initialize a new, empty ctf_fs_component. */ - -ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger); - /* * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing * the same UUID. @@ -195,36 +160,43 @@ ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger); */ 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, + bt2::ConstArrayValue pathsValue, const char *traceName, bt_self_component *selfComp); -/* Free `ctf_fs` and everything it owns. */ +namespace ctf { +namespace src { +namespace fs { + +/* `src.ctf.fs` parameters */ -void ctf_fs_destroy(struct ctf_fs_component *ctf_fs); +struct Parameters +{ + explicit Parameters(const bt2::ConstArrayValue inputsParam) noexcept : inputs {inputsParam} + { + } + + bt2::ConstArrayValue inputs; + bt2s::optional traceName; + ClkClsCfg clkClsCfg; +}; + +} /* namespace fs */ +} /* namespace src */ +} /* namespace ctf */ /* * Read and validate parameters taken by the src.ctf.fs plugin. * - * - The mandatory `paths` parameter is returned in `*paths`. - * - The optional `clock-class-offset-s` and `clock-class-offset-ns`, if - * present, are recorded in the `ctf_fs` structure. - * - The optional `trace-name` parameter is returned in `*trace_name` if - * present, else `*trace_name` is set to NULL. - * - * `self_comp` and `self_comp_class` are used for logging, only one of them - * should be set. - * - * Return true on success, false if any parameter didn't pass validation. + * Throw if any parameter doesn't pass validation. */ -bool read_src_fs_parameters(const bt_value *params, const bt_value **paths, - const bt_value **trace_name, struct ctf_fs_component *ctf_fs); +ctf::src::fs::Parameters read_src_fs_parameters(bt2::ConstMapValue params, + const bt2c::Logger& logger); /* * Generate the port name to be used for a given data stream file group. */ -bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group); +std::string ctf_fs_make_port_name(ctf_fs_ds_file_group *ds_file_group); -#endif /* BABELTRACE_PLUGIN_CTF_FS_H */ +#endif /* BABELTRACE_PLUGINS_CTF_FS_SRC_FS_HPP */