From f3d741246e4568e4a985b086d1aba233e39e853f Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 8 Jun 2022 15:56:51 -0400 Subject: [PATCH] src.ctf.fs: make ctf_fs_ds_file_group::ds_file_infos a vector of ctf_fs_ds_file_info::UP Signed-off-by: Simon Marchi Change-Id: I8df18be3ea1e78c78a8f0e7f0bfe1d43c390555b Reviewed-on: https://review.lttng.org/c/babeltrace/+/8250 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12288 --- src/plugins/ctf/fs-src/data-stream-file.cpp | 25 --------- src/plugins/ctf/fs-src/data-stream-file.hpp | 7 +-- src/plugins/ctf/fs-src/fs.cpp | 62 ++++++++------------- 3 files changed, 26 insertions(+), 68 deletions(-) diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp index aa27c959..21f47424 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.cpp +++ b/src/plugins/ctf/fs-src/data-stream-file.cpp @@ -927,15 +927,6 @@ void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index) delete index; } -void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info) -{ - if (!ds_file_info) { - return; - } - - delete ds_file_info; -} - ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns) { ctf_fs_ds_file_info::UP ds_file_info = bt2s::make_unique(); @@ -951,10 +942,6 @@ static void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_gr 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); @@ -973,24 +960,12 @@ ctf_fs_ds_file_group::UP ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs { ctf_fs_ds_file_group::UP 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: - ds_file_group.reset(); - ctf_fs_ds_index_destroy(index); - -end: return ds_file_group; } diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp index 86cc218b..13928179 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.hpp +++ b/src/plugins/ctf/fs-src/data-stream-file.hpp @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -121,15 +122,13 @@ struct ctf_fs_ds_file_group using UP = std::unique_ptr; /* - * Array of struct ctf_fs_ds_file_info, owned by this. - * * This is an _ordered_ array of data stream file infos which * belong to this group (a single stream instance). * * You can call ctf_fs_ds_file_create() with one of those paths * and the trace IR stream below. */ - GPtrArray *ds_file_infos = nullptr; + std::vector ds_file_infos; /* Owned by this */ struct ctf_stream_class *sc = nullptr; @@ -162,8 +161,6 @@ struct ctf_fs_ds_index *ctf_fs_ds_index_create(const bt2c::Logger& logger); void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index); -void ctf_fs_ds_file_info_destroy(struct ctf_fs_ds_file_info *ds_file_info); - ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns); ctf_fs_ds_file_group::UP ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs_trace, diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 8bc130b1..7ad16003 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -360,10 +360,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.c_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)}; @@ -446,21 +445,20 @@ static void array_insert(GPtrArray *array, gpointer element, size_t pos) */ 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, @@ -548,7 +546,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const ctf_fs_ds_file_group::UP new_ds_file_group; int ret; struct ctf_fs_ds_file *ds_file = NULL; - struct ctf_fs_ds_file_info *ds_file_info = NULL; + ctf_fs_ds_file_info::UP ds_file_info; struct ctf_fs_ds_index *index = NULL; struct ctf_msg_iter *msg_iter = NULL; struct ctf_stream_class *sc = NULL; @@ -601,12 +599,12 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const } } - ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns).release(); + ds_file_info = ctf_fs_ds_file_info_create(path, begin_ns); if (!ds_file_info) { 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, ds_file_info.get(), msg_iter); if (!index) { BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'", ds_file->file->path->str); @@ -639,8 +637,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const goto error; } - ds_file_group_insert_ds_file_info_sorted(new_ds_file_group.get(), - BT_MOVE_REF(ds_file_info)); + 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; } @@ -671,7 +668,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const merge_ctf_fs_ds_indexes(ds_file_group->index, 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; @@ -680,7 +677,6 @@ error: end: 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); @@ -1002,16 +998,8 @@ 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, 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. */ @@ -1716,15 +1704,13 @@ end: 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) { - BT_ASSERT(ds_file_group_a->ds_file_infos->len > 0); - BT_ASSERT(ds_file_group_b->ds_file_infos->len > 0); + BT_ASSERT(!ds_file_group_a->ds_file_infos.empty()); + BT_ASSERT(!ds_file_group_b->ds_file_infos.empty()); - 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]; + 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]; - return first_ds_file_info_a->path < first_ds_file_info_b->path; + return first_ds_file_info_a.path < first_ds_file_info_b.path; } static gint compare_strings(gconstpointer p_a, gconstpointer p_b) @@ -1882,8 +1868,8 @@ 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); + 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: -- 2.34.1