Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I8df18be3ea1e78c78a8f0e7f0bfe1d43c390555b
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8250
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12288
-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<ctf_fs_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<ctf_fs_ds_file_info>();
- 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);
ctf_fs_ds_index_destroy(ds_file_group->index);
bt_stream_put_ref(ds_file_group->stream);
{
ctf_fs_ds_file_group::UP ds_file_group {new ctf_fs_ds_file_group};
{
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;
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;
-error:
- ds_file_group.reset();
- ctf_fs_ds_index_destroy(index);
-
-end:
#include <memory>
#include <string>
#include <memory>
#include <string>
#include <glib.h>
#include <stdio.h>
#include <glib.h>
#include <stdio.h>
using UP = std::unique_ptr<ctf_fs_ds_file_group, ctf_fs_ds_file_group_deleter>;
/*
using UP = std::unique_ptr<ctf_fs_ds_file_group, ctf_fs_ds_file_group_deleter>;
/*
- * 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.
*/
* 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<ctf_fs_ds_file_info::UP> ds_file_infos;
/* Owned by this */
struct ctf_stream_class *sc = nullptr;
/* Owned by this */
struct ctf_stream_class *sc = nullptr;
void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
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,
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,
if (ds_file_group->stream_id != UINT64_C(-1)) {
g_string_append_printf(name, " | %" PRIu64, ds_file_group->stream_id);
} else {
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)};
}
return bt2c::GCharUP {g_string_free(name, FALSE)};
*/
static void ds_file_group_insert_ds_file_info_sorted(struct ctf_fs_ds_file_group *ds_file_group,
*/
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)
/* Find the spot where to insert this ds_file_info. */
/* 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) {
- 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,
}
static bool ds_index_entries_equal(const struct ctf_fs_ds_index_entry *left,
ctf_fs_ds_file_group::UP new_ds_file_group;
int ret;
struct ctf_fs_ds_file *ds_file = NULL;
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;
struct ctf_fs_ds_index *index = NULL;
struct ctf_msg_iter *msg_iter = NULL;
struct ctf_stream_class *sc = NULL;
- 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;
}
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);
if (!index) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(ctf_fs_trace->logger, "Failed to index CTF stream file \'{}\'",
ds_file->file->path->str);
- 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;
}
ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group));
goto end;
}
merge_ctf_fs_ds_indexes(ds_file_group->index, index);
}
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));
end:
ctf_fs_ds_file_destroy(ds_file);
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);
if (msg_iter) {
ctf_msg_iter_destroy(msg_iter);
static void merge_ctf_fs_ds_file_groups(struct ctf_fs_ds_file_group *dest,
ctf_fs_ds_file_group::UP src)
{
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. */
}
/* Merge both indexes. */
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)
{
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)
}
static gint compare_strings(gconstpointer p_a, gconstpointer p_b)
* group, the first (earliest) stream file's path is used as
* the stream's unique name.
*/
* 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:
g_string_assign(name, ds_file_info->path.c_str());
end: