X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.cpp;h=22baaf3b39736f4caa3dfe1247acfd931cfa6b53;hb=adf452d16fbbda0b100d348ca443bd290d5e3afb;hp=f2bd9618e1f9e95ad5483f328cec798d87646f82;hpb=f0940b019844bc5d4dcfc0e32f90c324a366d3d5;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index f2bd9618..22baaf3b 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -15,6 +15,7 @@ #include "common/assert.h" #include "common/common.h" #include "common/uuid.h" +#include "cpp-common/bt2s/make-unique.hpp" #include "plugins/common/param-validation/param-validation.h" @@ -34,30 +35,12 @@ struct tracer_info int64_t patch; }; -static void ctf_fs_msg_iter_data_destroy(struct ctf_fs_msg_iter_data *msg_iter_data) -{ - if (!msg_iter_data) { - return; - } - - if (msg_iter_data->msg_iter) { - ctf_msg_iter_destroy(msg_iter_data->msg_iter); - } - - if (msg_iter_data->msg_iter_medops_data) { - ctf_fs_ds_group_medops_data_destroy(msg_iter_data->msg_iter_medops_data); - } - - delete msg_iter_data; -} - static bt_message_iterator_class_next_method_status ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_message **out_msg) { bt_message_iterator_class_next_method_status status; - enum ctf_msg_iter_status msg_iter_status; - - msg_iter_status = ctf_msg_iter_get_next_message(msg_iter_data->msg_iter, out_msg); + const auto msg_iter_status = + ctf_msg_iter_get_next_message(msg_iter_data->msg_iter.get(), out_msg); switch (msg_iter_status) { case CTF_MSG_ITER_STATUS_OK: @@ -171,8 +154,8 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it) BT_ASSERT(msg_iter_data); - ctf_msg_iter_reset(msg_iter_data->msg_iter); - ctf_fs_ds_group_medops_data_reset(msg_iter_data->msg_iter_medops_data); + ctf_msg_iter_reset(msg_iter_data->msg_iter.get()); + ctf_fs_ds_group_medops_data_reset(msg_iter_data->msg_iter_medops_data.get()); return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK; } catch (const std::bad_alloc&) { @@ -184,8 +167,8 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it) void ctf_fs_iterator_finalize(bt_self_message_iterator *it) { - ctf_fs_msg_iter_data_destroy( - (struct ctf_fs_msg_iter_data *) bt_self_message_iterator_get_data(it)); + ctf_fs_msg_iter_data::UP { + (static_cast(bt_self_message_iterator_get_data(it)))}; } static bt_message_iterator_class_initialize_method_status @@ -219,12 +202,12 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter, bt_self_component_port_output_as_self_component_port(self_port)); BT_ASSERT(port_data); - ctf_fs_msg_iter_data *msg_iter_data = new ctf_fs_msg_iter_data {self_msg_iter}; + auto msg_iter_data = bt2s::make_unique(self_msg_iter); msg_iter_data->ds_file_group = port_data->ds_file_group; medium_status = ctf_fs_ds_group_medops_data_create(msg_iter_data->ds_file_group, self_msg_iter, msg_iter_data->logger, - &msg_iter_data->msg_iter_medops_data); + msg_iter_data->msg_iter_medops_data); BT_ASSERT(medium_status == CTF_MSG_ITER_MEDIUM_STATUS_OK || medium_status == CTF_MSG_ITER_MEDIUM_STATUS_ERROR || medium_status == CTF_MSG_ITER_MEDIUM_STATUS_MEMORY_ERROR); @@ -238,7 +221,7 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter, msg_iter_data->msg_iter = ctf_msg_iter_create( msg_iter_data->ds_file_group->ctf_fs_trace->metadata->tc, bt_common_get_page_size(static_cast(msg_iter_data->logger.level())) * 8, - ctf_fs_ds_group_medops, msg_iter_data->msg_iter_medops_data, self_msg_iter, + ctf_fs_ds_group_medops, msg_iter_data->msg_iter_medops_data.get(), self_msg_iter, msg_iter_data->logger); if (!msg_iter_data->msg_iter) { BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger, @@ -255,8 +238,7 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter, bt_self_message_iterator_configuration_set_can_seek_forward(config, true); } - bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data); - msg_iter_data = NULL; + bt_self_message_iterator_set_data(self_msg_iter, msg_iter_data.release()); status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK; goto end; @@ -265,7 +247,6 @@ error: bt_self_message_iterator_set_data(self_msg_iter, NULL); end: - ctf_fs_msg_iter_data_destroy(msg_iter_data); return status; } catch (const std::bad_alloc&) { return BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; @@ -280,10 +261,6 @@ static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) return; } - if (ctf_fs_trace->ds_file_groups) { - g_ptr_array_free(ctf_fs_trace->ds_file_groups, TRUE); - } - BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace); if (ctf_fs_trace->path) { @@ -298,68 +275,20 @@ static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace) delete ctf_fs_trace; } -void ctf_fs_destroy(struct ctf_fs_component *ctf_fs) -{ - if (!ctf_fs) { - return; - } - - ctf_fs_trace_destroy(ctf_fs->trace); - - if (ctf_fs->port_data) { - g_ptr_array_free(ctf_fs->port_data, TRUE); - } - - delete ctf_fs; -} - -void ctf_fs_component_deleter::operator()(ctf_fs_component *comp) -{ - ctf_fs_destroy(comp); -} - -static void port_data_destroy(struct ctf_fs_port_data *port_data) -{ - if (!port_data) { - return; - } - - delete port_data; -} - -static void port_data_destroy_notifier(void *data) +void ctf_fs_trace_deleter::operator()(ctf_fs_trace * const trace) noexcept { - port_data_destroy((struct ctf_fs_port_data *) data); -} - -static void ctf_fs_trace_destroy_notifier(void *data) -{ - struct ctf_fs_trace *trace = (struct ctf_fs_trace *) data; ctf_fs_trace_destroy(trace); } ctf_fs_component::UP ctf_fs_component_create(const bt2c::Logger& parentLogger) { - ctf_fs_component::UP ctf_fs {new ctf_fs_component {parentLogger}}; - - ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy_notifier); - if (!ctf_fs->port_data) { - goto error; - } - - goto end; - -error: - ctf_fs.reset(); - -end: - return ctf_fs; + return bt2s::make_unique(parentLogger); } void ctf_fs_finalize(bt_self_component_source *component) { - ctf_fs_destroy((struct ctf_fs_component *) bt_self_component_get_data( - bt_self_component_source_as_self_component(component))); + ctf_fs_component::UP {static_cast( + bt_self_component_get_data(bt_self_component_source_as_self_component(component)))}; } bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group) @@ -397,10 +326,9 @@ bt2c::GCharUP ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group) if (ds_file_group->stream_id != UINT64_C(-1)) { g_string_append_printf(name, " | %" PRIu64, ds_file_group->stream_id); } else { - BT_ASSERT(ds_file_group->ds_file_infos->len == 1); - struct ctf_fs_ds_file_info *ds_file_info = - (struct ctf_fs_ds_file_info *) g_ptr_array_index(ds_file_group->ds_file_infos, 0); - g_string_append_printf(name, " | %s", ds_file_info->path->str); + BT_ASSERT(ds_file_group->ds_file_infos.size() == 1); + const auto& ds_file_info = *ds_file_group->ds_file_infos[0]; + g_string_append_printf(name, " | %s", ds_file_info.path.c_str()); } return bt2c::GCharUP {g_string_free(name, FALSE)}; @@ -411,7 +339,7 @@ static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, bt_self_component_source *self_comp_src) { int ret = 0; - struct ctf_fs_port_data *port_data = NULL; + ctf_fs_port_data::UP port_data; bt2c::GCharUP port_name = ctf_fs_make_port_name(ds_file_group); if (!port_name) { @@ -421,23 +349,22 @@ static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, BT_CPPLOGI_SPEC(ctf_fs->logger, "Creating one port named `{}`", port_name.get()); /* Create output port for this file */ - port_data = new ctf_fs_port_data; + port_data = bt2s::make_unique(); port_data->ctf_fs = ctf_fs; port_data->ds_file_group = ds_file_group; - ret = bt_self_component_source_add_output_port(self_comp_src, port_name.get(), port_data, NULL); + ret = bt_self_component_source_add_output_port(self_comp_src, port_name.get(), port_data.get(), + NULL); if (ret) { goto error; } - g_ptr_array_add(ctf_fs->port_data, port_data); - port_data = NULL; + ctf_fs->port_data.emplace_back(std::move(port_data)); goto end; error: ret = -1; end: - port_data_destroy(port_data); return ret; } @@ -446,14 +373,10 @@ static int create_ports_for_trace(struct ctf_fs_component *ctf_fs, bt_self_component_source *self_comp_src) { int ret = 0; - size_t i; /* Create one output port for each stream file group */ - for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { - struct ctf_fs_ds_file_group *ds_file_group = - (struct ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i); - - ret = create_one_port_for_trace(ctf_fs, ds_file_group, self_comp_src); + for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) { + ret = create_one_port_for_trace(ctf_fs, ds_file_group.get(), self_comp_src); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create output port."); goto end; @@ -464,125 +387,32 @@ end: return ret; } -static void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info) -{ - if (!ds_file_info) { - return; - } - - if (ds_file_info->path) { - g_string_free(ds_file_info->path, TRUE); - } - - delete ds_file_info; -} - -static struct ctf_fs_ds_file_info *ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns) -{ - ctf_fs_ds_file_info *ds_file_info = new ctf_fs_ds_file_info; - ds_file_info->path = g_string_new(path); - if (!ds_file_info->path) { - ctf_fs_ds_file_info_destroy(ds_file_info); - ds_file_info = NULL; - goto end; - } - - ds_file_info->begin_ns = begin_ns; - -end: - return ds_file_info; -} - -static void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group) -{ - if (!ds_file_group) { - return; - } - - if (ds_file_group->ds_file_infos) { - g_ptr_array_free(ds_file_group->ds_file_infos, TRUE); - } - - ctf_fs_ds_index_destroy(ds_file_group->index); - - bt_stream_put_ref(ds_file_group->stream); - delete ds_file_group; -} - -static struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs_trace, - struct ctf_stream_class *sc, - uint64_t stream_instance_id, - struct ctf_fs_ds_index *index) -{ - ctf_fs_ds_file_group *ds_file_group = new ctf_fs_ds_file_group; - ds_file_group->ds_file_infos = - g_ptr_array_new_with_free_func((GDestroyNotify) ctf_fs_ds_file_info_destroy); - if (!ds_file_group->ds_file_infos) { - goto error; - } - - ds_file_group->index = index; - - ds_file_group->stream_id = stream_instance_id; - BT_ASSERT(sc); - ds_file_group->sc = sc; - ds_file_group->ctf_fs_trace = ctf_fs_trace; - goto end; - -error: - ctf_fs_ds_file_group_destroy(ds_file_group); - ctf_fs_ds_index_destroy(index); - ds_file_group = NULL; - -end: - return ds_file_group; -} - -/* Replace by g_ptr_array_insert when we depend on glib >= 2.40. */ -static void array_insert(GPtrArray *array, gpointer element, size_t pos) -{ - size_t original_array_len = array->len; - - /* Allocate an unused element at the end of the array. */ - g_ptr_array_add(array, NULL); - - /* If we are not inserting at the end, move the elements by one. */ - if (pos < original_array_len) { - memmove(&(array->pdata[pos + 1]), &(array->pdata[pos]), - (original_array_len - pos) * sizeof(gpointer)); - } - - /* Insert the value. */ - array->pdata[pos] = element; -} - /* * Insert ds_file_info in ds_file_group's list of ds_file_infos at the right * place to keep it sorted. */ static void ds_file_group_insert_ds_file_info_sorted(struct ctf_fs_ds_file_group *ds_file_group, - struct ctf_fs_ds_file_info *ds_file_info) + ctf_fs_ds_file_info::UP ds_file_info) { - guint i; - /* Find the spot where to insert this ds_file_info. */ - for (i = 0; i < ds_file_group->ds_file_infos->len; i++) { - struct ctf_fs_ds_file_info *other_ds_file_info = - (struct ctf_fs_ds_file_info *) g_ptr_array_index(ds_file_group->ds_file_infos, i); + auto it = ds_file_group->ds_file_infos.begin(); - if (ds_file_info->begin_ns < other_ds_file_info->begin_ns) { + for (; it != ds_file_group->ds_file_infos.end(); ++it) { + const ctf_fs_ds_file_info& other_ds_file_info = **it; + + if (ds_file_info->begin_ns < other_ds_file_info.begin_ns) { break; } } - array_insert(ds_file_group->ds_file_infos, ds_file_info, i); + ds_file_group->ds_file_infos.insert(it, std::move(ds_file_info)); } static bool ds_index_entries_equal(const struct ctf_fs_ds_index_entry *left, const struct ctf_fs_ds_index_entry *right) { - if (left->packet_size != right->packet_size) { + if (left->packetSize != right->packetSize) { return false; } @@ -611,16 +441,12 @@ static bool ds_index_entries_equal(const struct ctf_fs_ds_index_entry *left, */ static void ds_index_insert_ds_index_entry_sorted(struct ctf_fs_ds_index *index, - struct ctf_fs_ds_index_entry *entry) + ctf_fs_ds_index_entry::UP entry) { - guint i; - struct ctf_fs_ds_index_entry *other_entry = NULL; - /* Find the spot where to insert this index entry. */ - for (i = 0; i < index->entries->len; i++) { - other_entry = (struct ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, i); - - if (entry->timestamp_begin_ns <= other_entry->timestamp_begin_ns) { + auto otherEntry = index->entries.begin(); + for (; otherEntry != index->entries.end(); ++otherEntry) { + if (entry->timestamp_begin_ns <= (*otherEntry)->timestamp_begin_ns) { break; } } @@ -632,27 +458,16 @@ static void ds_index_insert_ds_index_entry_sorted(struct ctf_fs_ds_index *index, * snapshots of the same trace. We then want the index to contain * a reference to only one copy of that packet. */ - if (i == index->entries->len || !ds_index_entries_equal(entry, other_entry)) { - array_insert(index->entries, entry, i); - } else { - delete entry; + if (otherEntry == index->entries.end() || + !ds_index_entries_equal(entry.get(), otherEntry->get())) { + index->entries.insert(otherEntry, std::move(entry)); } } -static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, struct ctf_fs_ds_index *src) +static void merge_ctf_fs_ds_indexes(struct ctf_fs_ds_index *dest, ctf_fs_ds_index::UP src) { - guint i; - - for (i = 0; i < src->entries->len; i++) { - struct ctf_fs_ds_index_entry *entry = - (struct ctf_fs_ds_index_entry *) g_ptr_array_index(src->entries, i); - - /* - * Ownership of the ctf_fs_ds_index_entry is transferred to - * ds_index_insert_ds_index_entry_sorted. - */ - g_ptr_array_index(src->entries, i) = NULL; - ds_index_insert_ds_index_entry_sorted(dest, entry); + for (auto& entry : src->entries) { + ds_index_insert_ds_index_entry_sorted(dest, std::move(entry)); } } @@ -661,13 +476,11 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const int64_t stream_instance_id = -1; int64_t begin_ns = -1; struct ctf_fs_ds_file_group *ds_file_group = NULL; - bool add_group = false; + ctf_fs_ds_file_group::UP new_ds_file_group; int ret; - size_t i; - struct ctf_fs_ds_file *ds_file = NULL; - struct ctf_fs_ds_file_info *ds_file_info = NULL; - struct ctf_fs_ds_index *index = NULL; - struct ctf_msg_iter *msg_iter = NULL; + ctf_fs_ds_file_info::UP ds_file_info; + ctf_fs_ds_index::UP index; + ctf_msg_iter_up msg_iter; struct ctf_stream_class *sc = NULL; struct ctf_msg_iter_packet_properties props; @@ -675,7 +488,8 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const * Create a temporary ds_file to read some properties about the data * stream file. */ - ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, path, ctf_fs_trace->logger); + const auto ds_file = + ctf_fs_ds_file_create(ctf_fs_trace, bt2::Stream::Shared {}, path, ctf_fs_trace->logger); if (!ds_file) { goto error; } @@ -684,15 +498,15 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const msg_iter = ctf_msg_iter_create( ctf_fs_trace->metadata->tc, bt_common_get_page_size(static_cast(ctf_fs_trace->logger.level())) * 8, - ctf_fs_ds_file_medops, ds_file, nullptr, ctf_fs_trace->logger); + ctf_fs_ds_file_medops, ds_file.get(), nullptr, ctf_fs_trace->logger); if (!msg_iter) { BT_CPPLOGE_STR_SPEC(ctf_fs_trace->logger, "Cannot create a CTF message iterator."); goto error; } - ctf_msg_iter_set_dry_run(msg_iter, true); + ctf_msg_iter_set_dry_run(msg_iter.get(), true); - ret = ctf_msg_iter_get_packet_properties(msg_iter, &props); + ret = ctf_msg_iter_get_packet_properties(msg_iter.get(), &props); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC( ctf_fs_trace->logger, @@ -723,10 +537,10 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const goto error; } - index = ctf_fs_ds_file_build_index(ds_file, ds_file_info, msg_iter); + index = ctf_fs_ds_file_build_index(ds_file.get(), ds_file_info.get(), msg_iter.get()); if (!index) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'", - ds_file->file->path->str); + ds_file->file->path); goto error; } @@ -747,17 +561,15 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const * there's no timestamp to order the file within its * group. */ - ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), index); - /* Ownership of index is transferred. */ - index = NULL; + new_ds_file_group = + ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), std::move(index)); - if (!ds_file_group) { + if (!new_ds_file_group) { goto error; } - ds_file_group_insert_ds_file_info_sorted(ds_file_group, BT_MOVE_REF(ds_file_info)); - - add_group = true; + ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(), std::move(ds_file_info)); + ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group)); goto end; } @@ -765,52 +577,34 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const BT_ASSERT(begin_ns != -1); /* Find an existing stream file group with this ID */ - for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { - ds_file_group = - (struct ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i); - - if (ds_file_group->sc == sc && ds_file_group->stream_id == stream_instance_id) { + for (const auto& candidate : ctf_fs_trace->ds_file_groups) { + if (candidate->sc == sc && candidate->stream_id == stream_instance_id) { + ds_file_group = candidate.get(); break; } - - ds_file_group = NULL; } if (!ds_file_group) { - ds_file_group = ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, index); - /* Ownership of index is transferred. */ - index = NULL; - if (!ds_file_group) { + new_ds_file_group = + ctf_fs_ds_file_group_create(ctf_fs_trace, sc, stream_instance_id, std::move(index)); + if (!new_ds_file_group) { goto error; } - add_group = true; + ds_file_group = new_ds_file_group.get(); + ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group)); } else { - merge_ctf_fs_ds_indexes(ds_file_group->index, index); + merge_ctf_fs_ds_indexes(ds_file_group->index.get(), std::move(index)); } - ds_file_group_insert_ds_file_info_sorted(ds_file_group, BT_MOVE_REF(ds_file_info)); + ds_file_group_insert_ds_file_info_sorted(ds_file_group, std::move(ds_file_info)); goto end; error: - ctf_fs_ds_file_group_destroy(ds_file_group); - ds_file_group = NULL; ret = -1; end: - if (add_group && ds_file_group) { - g_ptr_array_add(ctf_fs_trace->ds_file_groups, ds_file_group); - } - - ctf_fs_ds_file_destroy(ds_file); - ctf_fs_ds_file_info_destroy(ds_file_info); - - if (msg_iter) { - ctf_msg_iter_destroy(msg_iter); - } - - ctf_fs_ds_index_destroy(index); return ret; } @@ -831,8 +625,6 @@ static int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) } while ((basename = g_dir_read_name(dir))) { - struct ctf_fs_file *file; - if (strcmp(basename, CTF_FS_METADATA_FILENAME) == 0) { /* Ignore the metadata stream. */ BT_CPPLOGI_SPEC(ctf_fs_trace->logger, @@ -849,7 +641,7 @@ static int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) } /* Create the file. */ - file = ctf_fs_file_create(ctf_fs_trace->logger); + const auto file = ctf_fs_file_create(ctf_fs_trace->logger); if (!file) { BT_CPPLOGE_APPEND_CAUSE_SPEC( ctf_fs_trace->logger, @@ -859,40 +651,33 @@ static int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace) } /* Create full path string. */ - g_string_append_printf(file->path, "%s" G_DIR_SEPARATOR_S "%s", ctf_fs_trace->path->str, - basename); - if (!g_file_test(file->path->str, G_FILE_TEST_IS_REGULAR)) { - BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring non-regular file `{}`", - file->path->str); - ctf_fs_file_destroy(file); - file = NULL; + file->path = fmt::format("{}" G_DIR_SEPARATOR_S "{}", ctf_fs_trace->path->str, basename); + + if (!g_file_test(file->path.c_str(), G_FILE_TEST_IS_REGULAR)) { + BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring non-regular file `{}`", file->path); continue; } - ret = ctf_fs_file_open(file, "rb"); + ret = ctf_fs_file_open(file.get(), "rb"); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot open stream file `{}`", - file->path->str); + file->path); goto error; } if (file->size == 0) { /* Skip empty stream. */ - BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring empty file `{}`", file->path->str); - ctf_fs_file_destroy(file); + BT_CPPLOGI_SPEC(ctf_fs_trace->logger, "Ignoring empty file `{}`", file->path); continue; } - ret = add_ds_file_to_ds_file_group(ctf_fs_trace, file->path->str); + ret = add_ds_file_to_ds_file_group(ctf_fs_trace, file->path.c_str()); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot add stream file `{}` to stream file group", - file->path->str); - ctf_fs_file_destroy(file); + file->path); goto error; } - - ctf_fs_file_destroy(file); } goto end; @@ -958,14 +743,14 @@ end: return ret; } -static struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name, - struct ctf_fs_metadata_config *metadata_config, - bt_self_component *selfComp, - const bt2c::Logger& parentLogger) +static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name, + const ctf::src::ClkClsCfg& clkClsCfg, + bt_self_component *selfComp, + const bt2c::Logger& parentLogger) { int ret; - ctf_fs_trace *ctf_fs_trace = new struct ctf_fs_trace(parentLogger); + ctf_fs_trace::UP ctf_fs_trace {new struct ctf_fs_trace(parentLogger)}; ctf_fs_trace->path = g_string_new(path); if (!ctf_fs_trace->path) { goto error; @@ -973,13 +758,8 @@ static struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *na ctf_fs_trace->metadata = new ctf_fs_metadata; ctf_fs_metadata_init(ctf_fs_trace->metadata); - ctf_fs_trace->ds_file_groups = - g_ptr_array_new_with_free_func((GDestroyNotify) ctf_fs_ds_file_group_destroy); - if (!ctf_fs_trace->ds_file_groups) { - goto error; - } - ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace, metadata_config); + ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg); if (ret) { goto error; } @@ -1003,7 +783,7 @@ static struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *na } } - ret = create_ds_file_groups(ctf_fs_trace); + ret = create_ds_file_groups(ctf_fs_trace.get()); if (ret) { goto error; } @@ -1011,8 +791,7 @@ static struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *na goto end; error: - ctf_fs_trace_destroy(ctf_fs_trace); - ctf_fs_trace = NULL; + ctf_fs_trace.reset(); end: return ctf_fs_trace; @@ -1044,10 +823,11 @@ end: static int ctf_fs_component_create_ctf_fs_trace_one_path(struct ctf_fs_component *ctf_fs, const char *path_param, - const char *trace_name, GPtrArray *traces, + const char *trace_name, + std::vector& traces, bt_self_component *selfComp) { - struct ctf_fs_trace *ctf_fs_trace; + ctf_fs_trace::UP ctf_fs_trace; int ret; GString *norm_path; @@ -1076,16 +856,15 @@ static int ctf_fs_component_create_ctf_fs_trace_one_path(struct ctf_fs_component goto end; } - ctf_fs_trace = ctf_fs_trace_create(norm_path->str, trace_name, &ctf_fs->metadata_config, - selfComp, ctf_fs->logger); + ctf_fs_trace = ctf_fs_trace_create(norm_path->str, trace_name, ctf_fs->clkClsCfg, selfComp, + ctf_fs->logger); if (!ctf_fs_trace) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Cannot create trace for `{}`.", norm_path->str); goto error; } - g_ptr_array_add(traces, ctf_fs_trace); - ctf_fs_trace = NULL; + traces.emplace_back(std::move(ctf_fs_trace)); ret = 0; goto end; @@ -1130,52 +909,39 @@ static unsigned int metadata_count_stream_and_event_classes(struct ctf_fs_trace */ static void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest, - struct ctf_fs_ds_file_group *src) + ctf_fs_ds_file_group::UP src) { - guint i; - - for (i = 0; i < src->ds_file_infos->len; i++) { - struct ctf_fs_ds_file_info *ds_file_info = - (struct ctf_fs_ds_file_info *) g_ptr_array_index(src->ds_file_infos, i); - - /* Ownership of the ds_file_info is transferred to dest. */ - g_ptr_array_index(src->ds_file_infos, i) = NULL; - - ds_file_group_insert_ds_file_info_sorted(dest, ds_file_info); + for (auto& ds_file_info : src->ds_file_infos) { + ds_file_group_insert_ds_file_info_sorted(dest, std::move(ds_file_info)); } /* Merge both indexes. */ - merge_ctf_fs_ds_indexes(dest->index, src->index); + merge_ctf_fs_ds_indexes(dest->index.get(), std::move(src->index)); } + /* Merge src_trace's data stream file groups into dest_trace's. */ static int merge_matching_ctf_fs_ds_file_groups(struct ctf_fs_trace *dest_trace, - struct ctf_fs_trace *src_trace) + ctf_fs_trace::UP src_trace) { - GPtrArray *dest = dest_trace->ds_file_groups; - GPtrArray *src = src_trace->ds_file_groups; - guint s_i; + std::vector& dest = dest_trace->ds_file_groups; + std::vector& src = src_trace->ds_file_groups; int ret = 0; /* * Save the initial length of dest: we only want to check against the * original elements in the inner loop. */ - const guint dest_len = dest->len; + size_t dest_len = dest.size(); - for (s_i = 0; s_i < src->len; s_i++) { - struct ctf_fs_ds_file_group *src_group = - (struct ctf_fs_ds_file_group *) g_ptr_array_index(src, s_i); + for (auto& src_group : src) { struct ctf_fs_ds_file_group *dest_group = NULL; /* A stream instance without ID can't match a stream in the other trace. */ if (src_group->stream_id != -1) { - guint d_i; - /* Let's search for a matching ds_file_group in the destination. */ - for (d_i = 0; d_i < dest_len; d_i++) { - struct ctf_fs_ds_file_group *candidate_dest = - (struct ctf_fs_ds_file_group *) g_ptr_array_index(dest, d_i); + for (size_t d_i = 0; d_i < dest_len; ++d_i) { + ctf_fs_ds_file_group *candidate_dest = dest[d_i].get(); /* Can't match a stream instance without ID. */ if (candidate_dest->stream_id == -1) { @@ -1206,31 +972,31 @@ static int merge_matching_ctf_fs_ds_file_groups(struct ctf_fs_trace *dest_trace, */ if (!dest_group) { struct ctf_stream_class *sc; - struct ctf_fs_ds_index *index; sc = ctf_trace_class_borrow_stream_class_by_id(dest_trace->metadata->tc, src_group->sc->id); BT_ASSERT(sc); - index = ctf_fs_ds_index_create(dest_trace->logger); + auto index = ctf_fs_ds_index_create(); if (!index) { ret = -1; goto end; } - dest_group = ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, index); - /* Ownership of index is transferred. */ - index = NULL; - if (!dest_group) { + auto new_dest_group = + ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, std::move(index)); + + if (!new_dest_group) { ret = -1; goto end; } - g_ptr_array_add(dest_trace->ds_file_groups, dest_group); + dest_group = new_dest_group.get(); + dest_trace->ds_file_groups.emplace_back(std::move(new_dest_group)); } BT_ASSERT(dest_group); - merge_ctf_fs_ds_file_groups(dest_group, src_group); + merge_ctf_fs_ds_file_groups(dest_group, std::move(src_group)); } end: @@ -1242,32 +1008,28 @@ end: * one. * * The trace with the most expansive metadata is chosen and all other traces - * are merged into that one. The array slots of all the traces that get merged - * in the chosen one are set to NULL, so only the slot of the chosen trace - * remains non-NULL. + * are merged into that one. On return, the elements of `traces` are nullptr + * and the merged trace is placed in `out_trace`. */ -static int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_traces, - struct ctf_fs_trace **out_trace) +static int merge_ctf_fs_traces(std::vector traces, ctf_fs_trace::UP& out_trace) { unsigned int winner_count; struct ctf_fs_trace *winner; guint i, winner_i; int ret = 0; - BT_ASSERT(num_traces >= 2); + BT_ASSERT(traces.size() >= 2); - winner_count = metadata_count_stream_and_event_classes(traces[0]); - winner = traces[0]; + winner_count = metadata_count_stream_and_event_classes(traces[0].get()); + winner = traces[0].get(); winner_i = 0; /* Find the trace with the largest metadata. */ - for (i = 1; i < num_traces; i++) { - struct ctf_fs_trace *candidate; + for (i = 1; i < traces.size(); i++) { + ctf_fs_trace *candidate = traces[i].get(); unsigned int candidate_count; - candidate = traces[i]; - /* A bit of sanity check. */ BT_ASSERT(bt_uuid_compare(winner->metadata->tc->uuid, candidate->metadata->tc->uuid) == 0); @@ -1281,16 +1043,14 @@ static int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_tr } /* Merge all the other traces in the winning trace. */ - for (i = 0; i < num_traces; i++) { - struct ctf_fs_trace *trace = traces[i]; - + for (ctf_fs_trace::UP& trace : traces) { /* Don't merge the winner into itself. */ - if (trace == winner) { + if (trace.get() == winner) { continue; } /* Merge trace's data stream file groups into winner's. */ - ret = merge_matching_ctf_fs_ds_file_groups(winner, trace); + ret = merge_matching_ctf_fs_ds_file_groups(winner, std::move(trace)); if (ret) { goto end; } @@ -1299,8 +1059,7 @@ static int merge_ctf_fs_traces(struct ctf_fs_trace **traces, unsigned int num_tr /* * Move the winner out of the array, into `*out_trace`. */ - *out_trace = winner; - traces[winner_i] = NULL; + out_trace = std::move(traces[winner_i]); end: return ret; @@ -1319,15 +1078,15 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace, int64_t *ts_ns) { enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK; - struct ctf_fs_ds_file *ds_file = NULL; - struct ctf_msg_iter *msg_iter = NULL; + ctf_msg_iter_up msg_iter; int ret = 0; BT_ASSERT(ctf_fs_trace); BT_ASSERT(index_entry); BT_ASSERT(index_entry->path); - ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, index_entry->path, ctf_fs_trace->logger); + const auto ds_file = ctf_fs_ds_file_create(ctf_fs_trace, bt2::Stream::Shared {}, + index_entry->path, ctf_fs_trace->logger); if (!ds_file) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to create a ctf_fs_ds_file"); ret = -1; @@ -1340,7 +1099,7 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace, msg_iter = ctf_msg_iter_create( ctf_fs_trace->metadata->tc, bt_common_get_page_size(static_cast(ctf_fs_trace->logger.level())) * 8, - ctf_fs_ds_file_medops, ds_file, NULL, ctf_fs_trace->logger); + ctf_fs_ds_file_medops, ds_file.get(), NULL, ctf_fs_trace->logger); if (!msg_iter) { /* ctf_msg_iter_create() logs errors. */ ret = -1; @@ -1351,10 +1110,10 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace, * Turn on dry run mode to prevent the creation and usage of Babeltrace * library objects (bt_field, bt_message_*, etc.). */ - ctf_msg_iter_set_dry_run(msg_iter, true); + ctf_msg_iter_set_dry_run(msg_iter.get(), true); /* Seek to the beginning of the target packet. */ - iter_status = ctf_msg_iter_seek(msg_iter, index_entry->offset); + iter_status = ctf_msg_iter_seek(msg_iter.get(), index_entry->offset.bytes()); if (iter_status) { /* ctf_msg_iter_seek() logs errors. */ ret = -1; @@ -1368,11 +1127,11 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace, * the first event. To extract the first event's clock * snapshot. */ - iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(msg_iter, cs); + iter_status = ctf_msg_iter_curr_packet_first_event_clock_snapshot(msg_iter.get(), cs); break; case LAST_EVENT: /* Decode the packet to extract the last event's clock snapshot. */ - iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(msg_iter, cs); + iter_status = ctf_msg_iter_curr_packet_last_event_clock_snapshot(msg_iter.get(), cs); break; default: bt_common_abort(); @@ -1392,13 +1151,6 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace, } end: - if (ds_file) { - ctf_fs_ds_file_destroy(ds_file); - } - if (msg_iter) { - ctf_msg_iter_destroy(msg_iter); - } - return ret; } @@ -1441,34 +1193,23 @@ static int decode_packet_last_event_timestamp(struct ctf_fs_trace *ctf_fs_trace, static int fix_index_lttng_event_after_packet_bug(struct ctf_fs_trace *trace) { int ret = 0; - guint ds_file_group_i; - GPtrArray *ds_file_groups = trace->ds_file_groups; - for (ds_file_group_i = 0; ds_file_group_i < ds_file_groups->len; ds_file_group_i++) { - guint entry_i; + for (const auto& ds_file_group : trace->ds_file_groups) { struct ctf_clock_class *default_cc; - struct ctf_fs_ds_index_entry *last_entry; - struct ctf_fs_ds_index *index; - - struct ctf_fs_ds_file_group *ds_file_group = - (struct ctf_fs_ds_file_group *) g_ptr_array_index(ds_file_groups, ds_file_group_i); BT_ASSERT(ds_file_group); - index = ds_file_group->index; + const auto index = ds_file_group->index.get(); BT_ASSERT(index); - BT_ASSERT(index->entries); - BT_ASSERT(index->entries->len > 0); + BT_ASSERT(!index->entries.empty()); /* * Iterate over all entries but the last one. The last one is * fixed differently after. */ - for (entry_i = 0; entry_i < index->entries->len - 1; entry_i++) { - struct ctf_fs_ds_index_entry *curr_entry, *next_entry; - - curr_entry = (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i); - next_entry = (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i + 1); + for (size_t entry_i = 0; entry_i < index->entries.size() - 1; ++entry_i) { + ctf_fs_ds_index_entry *curr_entry = index->entries[entry_i].get(); + ctf_fs_ds_index_entry *next_entry = index->entries[entry_i + 1].get(); /* * 1. Set the current index entry `end` timestamp to @@ -1482,8 +1223,7 @@ static int fix_index_lttng_event_after_packet_bug(struct ctf_fs_trace *trace) * 2. Fix the last entry by decoding the last event of the last * packet. */ - last_entry = - (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, index->entries->len - 1); + const auto last_entry = index->entries.back().get(); BT_ASSERT(last_entry); BT_ASSERT(ds_file_group->sc->default_clock_class); @@ -1525,20 +1265,13 @@ end: static int fix_index_barectf_event_before_packet_bug(struct ctf_fs_trace *trace) { int ret = 0; - guint ds_file_group_i; - GPtrArray *ds_file_groups = trace->ds_file_groups; - for (ds_file_group_i = 0; ds_file_group_i < ds_file_groups->len; ds_file_group_i++) { - guint entry_i; + for (const auto& ds_file_group : trace->ds_file_groups) { struct ctf_clock_class *default_cc; - ctf_fs_ds_file_group *ds_file_group = - (ctf_fs_ds_file_group *) g_ptr_array_index(ds_file_groups, ds_file_group_i); - - struct ctf_fs_ds_index *index = ds_file_group->index; + const auto index = ds_file_group->index.get(); BT_ASSERT(index); - BT_ASSERT(index->entries); - BT_ASSERT(index->entries->len > 0); + BT_ASSERT(!index->entries.empty()); BT_ASSERT(ds_file_group->sc->default_clock_class); default_cc = ds_file_group->sc->default_clock_class; @@ -1547,11 +1280,9 @@ static int fix_index_barectf_event_before_packet_bug(struct ctf_fs_trace *trace) * 1. Iterate over the index, starting from the second entry * (index = 1). */ - for (entry_i = 1; entry_i < index->entries->len; entry_i++) { - ctf_fs_ds_index_entry *prev_entry = - (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i - 1); - ctf_fs_ds_index_entry *curr_entry = - (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_i); + for (size_t entry_i = 1; entry_i < index->entries.size(); ++entry_i) { + ctf_fs_ds_index_entry *prev_entry = index->entries[entry_i - 1].get(); + ctf_fs_ds_index_entry *curr_entry = index->entries[entry_i].get(); /* * 2. Set the current entry `begin` timestamp to the * timestamp of the first event of the current packet. @@ -1597,29 +1328,20 @@ end: static int fix_index_lttng_crash_quirk(struct ctf_fs_trace *trace) { int ret = 0; - guint ds_file_group_idx; - GPtrArray *ds_file_groups = trace->ds_file_groups; - for (ds_file_group_idx = 0; ds_file_group_idx < ds_file_groups->len; ds_file_group_idx++) { - guint entry_idx; + for (const auto& ds_file_group : trace->ds_file_groups) { struct ctf_clock_class *default_cc; - struct ctf_fs_ds_index *index; - - ctf_fs_ds_file_group *ds_file_group = - (ctf_fs_ds_file_group *) g_ptr_array_index(ds_file_groups, ds_file_group_idx); BT_ASSERT(ds_file_group); - index = ds_file_group->index; + const auto index = ds_file_group->index.get(); BT_ASSERT(ds_file_group->sc->default_clock_class); default_cc = ds_file_group->sc->default_clock_class; BT_ASSERT(index); - BT_ASSERT(index->entries); - BT_ASSERT(index->entries->len > 0); + BT_ASSERT(!index->entries.empty()); - ctf_fs_ds_index_entry *last_entry = - (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, index->entries->len - 1); + const auto last_entry = index->entries.back().get(); BT_ASSERT(last_entry); /* 1. Fix the last entry first. */ @@ -1639,11 +1361,9 @@ static int fix_index_lttng_crash_quirk(struct ctf_fs_trace *trace) } /* Iterate over all entries but the last one. */ - for (entry_idx = 0; entry_idx < index->entries->len - 1; entry_idx++) { - ctf_fs_ds_index_entry *curr_entry = - (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_idx); - ctf_fs_ds_index_entry *next_entry = - (ctf_fs_ds_index_entry *) g_ptr_array_index(index->entries, entry_idx + 1); + for (size_t entry_idx = 0; entry_idx < index->entries.size() - 1; ++entry_idx) { + ctf_fs_ds_index_entry *curr_entry = index->entries[entry_idx].get(); + ctf_fs_ds_index_entry *next_entry = index->entries[entry_idx + 1].get(); if (curr_entry->timestamp_end == 0 && curr_entry->timestamp_begin != 0) { /* @@ -1867,20 +1587,16 @@ end: return ret; } -static gint compare_ds_file_groups_by_first_path(gconstpointer a, gconstpointer b) +static bool compare_ds_file_groups_by_first_path(const ctf_fs_ds_file_group::UP& ds_file_group_a, + const ctf_fs_ds_file_group::UP& ds_file_group_b) { - ctf_fs_ds_file_group * const *ds_file_group_a = (ctf_fs_ds_file_group **) a; - ctf_fs_ds_file_group * const *ds_file_group_b = (ctf_fs_ds_file_group **) b; + BT_ASSERT(!ds_file_group_a->ds_file_infos.empty()); + BT_ASSERT(!ds_file_group_b->ds_file_infos.empty()); - BT_ASSERT((*ds_file_group_a)->ds_file_infos->len > 0); - BT_ASSERT((*ds_file_group_b)->ds_file_infos->len > 0); + const auto& first_ds_file_info_a = *ds_file_group_a->ds_file_infos[0]; + const auto& first_ds_file_info_b = *ds_file_group_b->ds_file_infos[0]; - const ctf_fs_ds_file_info *first_ds_file_info_a = - (const ctf_fs_ds_file_info *) (*ds_file_group_a)->ds_file_infos->pdata[0]; - const ctf_fs_ds_file_info *first_ds_file_info_b = - (const ctf_fs_ds_file_info *) (*ds_file_group_b)->ds_file_infos->pdata[0]; - - return strcmp(first_ds_file_info_a->path->str, first_ds_file_info_b->path->str); + return first_ds_file_info_a.path < first_ds_file_info_b.path; } static gint compare_strings(gconstpointer p_a, gconstpointer p_b) @@ -1899,18 +1615,12 @@ int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs, int ret = 0; uint64_t i; GPtrArray *paths = NULL; - GPtrArray *traces; + std::vector traces; const char *trace_name; BT_ASSERT(bt_value_get_type(paths_value) == BT_VALUE_TYPE_ARRAY); BT_ASSERT(!bt_value_array_is_empty(paths_value)); - traces = g_ptr_array_new_with_free_func(ctf_fs_trace_destroy_notifier); - if (!traces) { - BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to allocate a GPtrArray."); - goto error; - } - paths = g_ptr_array_new_with_free_func(g_free); if (!paths) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to allocate a GPtrArray."); @@ -1950,17 +1660,16 @@ int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs, } } - if (traces->len > 1) { - struct ctf_fs_trace *first_trace = (struct ctf_fs_trace *) traces->pdata[0]; + if (traces.size() > 1) { + ctf_fs_trace *first_trace = traces[0].get(); const uint8_t *first_trace_uuid = first_trace->metadata->tc->uuid; - struct ctf_fs_trace *trace; /* * We have more than one trace, they must all share the same * UUID, verify that. */ - for (i = 0; i < traces->len; i++) { - struct ctf_fs_trace *this_trace = (struct ctf_fs_trace *) traces->pdata[i]; + for (i = 0; i < traces.size(); i++) { + ctf_fs_trace *this_trace = traces[i].get(); const uint8_t *this_trace_uuid = this_trace->metadata->tc->uuid; if (!this_trace->metadata->tc->is_uuid_set) { @@ -1988,21 +1697,18 @@ int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs, } } - ret = merge_ctf_fs_traces((struct ctf_fs_trace **) traces->pdata, traces->len, &trace); + ret = merge_ctf_fs_traces(std::move(traces), ctf_fs->trace); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to merge traces with the same UUID."); goto error; } - - ctf_fs->trace = trace; } else { /* Just one trace, it may or may not have a UUID, both are fine. */ - ctf_fs->trace = (ctf_fs_trace *) traces->pdata[0]; - traces->pdata[0] = NULL; + ctf_fs->trace = std::move(traces[0]); } - ret = fix_packet_index_tracer_bugs(ctf_fs->trace); + ret = fix_packet_index_tracer_bugs(ctf_fs->trace.get()); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs->logger, "Failed to fix packet index tracer bugs."); } @@ -2019,16 +1725,13 @@ int ctf_fs_component_create_ctf_fs_trace(struct ctf_fs_component *ctf_fs, * Having a deterministic order here can help debugging and * testing. */ - g_ptr_array_sort(ctf_fs->trace->ds_file_groups, compare_ds_file_groups_by_first_path); + std::sort(ctf_fs->trace->ds_file_groups.begin(), ctf_fs->trace->ds_file_groups.end(), + compare_ds_file_groups_by_first_path); goto end; error: ret = -1; end: - if (traces) { - g_ptr_array_free(traces, TRUE); - } - if (paths) { g_ptr_array_free(paths, TRUE); } @@ -2051,9 +1754,9 @@ static GString *get_stream_instance_unique_name(struct ctf_fs_ds_file_group *ds_ * group, the first (earliest) stream file's path is used as * the stream's unique name. */ - BT_ASSERT(ds_file_group->ds_file_infos->len > 0); - ds_file_info = (ctf_fs_ds_file_info *) g_ptr_array_index(ds_file_group->ds_file_infos, 0); - g_string_assign(name, ds_file_info->path->str); + BT_ASSERT(!ds_file_group->ds_file_infos.empty()); + ds_file_info = ds_file_group->ds_file_infos[0].get(); + g_string_assign(name, ds_file_info->path.c_str()); end: return name; @@ -2065,12 +1768,9 @@ static int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace) { int ret; GString *name = NULL; - guint i; - for (i = 0; i < ctf_fs_trace->ds_file_groups->len; i++) { - ctf_fs_ds_file_group *ds_file_group = - (ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i); - name = get_stream_instance_unique_name(ds_file_group); + for (const auto& ds_file_group : ctf_fs_trace->ds_file_groups) { + name = get_stream_instance_unique_name(ds_file_group.get()); if (!name) { goto error; @@ -2079,18 +1779,20 @@ static int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace) BT_ASSERT(ds_file_group->sc->ir_sc); BT_ASSERT(ctf_fs_trace->trace); + bt_stream *stream; + if (ds_file_group->stream_id == UINT64_C(-1)) { /* No stream ID: use 0 */ - ds_file_group->stream = bt_stream_create_with_id( - ds_file_group->sc->ir_sc, ctf_fs_trace->trace, ctf_fs_trace->next_stream_id); + stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace, + ctf_fs_trace->next_stream_id); ctf_fs_trace->next_stream_id++; } else { /* Specific stream ID */ - ds_file_group->stream = bt_stream_create_with_id( - ds_file_group->sc->ir_sc, ctf_fs_trace->trace, (uint64_t) ds_file_group->stream_id); + stream = bt_stream_create_with_id(ds_file_group->sc->ir_sc, ctf_fs_trace->trace, + (uint64_t) ds_file_group->stream_id); } - if (!ds_file_group->stream) { + if (!stream) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot create stream for DS file group: " "addr={}, stream-name=\"{}\"", @@ -2098,12 +1800,14 @@ static int create_streams_for_trace(struct ctf_fs_trace *ctf_fs_trace) goto error; } - ret = bt_stream_set_name(ds_file_group->stream, name->str); + ds_file_group->stream = bt2::Stream::Shared::createWithoutRef(stream); + + ret = bt_stream_set_name(ds_file_group->stream->libObjPtr(), name->str); if (ret) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Cannot set stream's name: " "addr={}, stream-name=\"{}\"", - fmt::ptr(ds_file_group->stream), name->str); + fmt::ptr(ds_file_group->stream->libObjPtr()), name->str); goto error; } @@ -2163,19 +1867,19 @@ bool read_src_fs_parameters(const bt_value *params, const bt_value **inputs, /* clock-class-offset-s parameter */ value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-s"); if (value) { - ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_signed_get(value); + ctf_fs->clkClsCfg.offsetSec = bt_value_integer_signed_get(value); } /* clock-class-offset-ns parameter */ value = bt_value_map_borrow_entry_value_const(params, "clock-class-offset-ns"); if (value) { - ctf_fs->metadata_config.clock_class_offset_ns = bt_value_integer_signed_get(value); + ctf_fs->clkClsCfg.offsetNanoSec = bt_value_integer_signed_get(value); } /* force-clock-class-origin-unix-epoch parameter */ value = bt_value_map_borrow_entry_value_const(params, "force-clock-class-origin-unix-epoch"); if (value) { - ctf_fs->metadata_config.force_clock_class_origin_unix_epoch = bt_value_bool_get(value); + ctf_fs->clkClsCfg.forceOriginIsUnixEpoch = bt_value_bool_get(value); } /* trace-name parameter */ @@ -2210,11 +1914,11 @@ static ctf_fs_component::UP ctf_fs_create(const bt_value *params, return nullptr; } - if (create_streams_for_trace(ctf_fs->trace)) { + if (create_streams_for_trace(ctf_fs->trace.get())) { return nullptr; } - if (create_ports_for_trace(ctf_fs.get(), ctf_fs->trace, self_comp_src)) { + if (create_ports_for_trace(ctf_fs.get(), ctf_fs->trace.get(), self_comp_src)) { return nullptr; }