From 86c826365e1859d7ca966cd0b70ad581f8e2d487 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 9 Apr 2024 23:31:37 -0400 Subject: [PATCH] src.ctf.fs: remove ctf_fs_ds_file_group_create, add constructor Replace ctf_fs_ds_file_group_create with an equivalent constructor. Change-Id: I06d69a05ba685552dc2d6b78800d79f20569a340 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8435 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12360 Tested-by: jenkins --- src/plugins/ctf/fs-src/data-stream-file.cpp | 17 ---------- src/plugins/ctf/fs-src/data-stream-file.hpp | 15 ++++++--- src/plugins/ctf/fs-src/fs.cpp | 37 +++++---------------- 3 files changed, 19 insertions(+), 50 deletions(-) diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp index 73c896a9..e4bebf9f 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.cpp +++ b/src/plugins/ctf/fs-src/data-stream-file.cpp @@ -729,23 +729,6 @@ ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t beg return ds_file_info; } -ctf_fs_ds_file_group::UP ctf_fs_ds_file_group_create(struct ctf_fs_trace *ctf_fs_trace, - struct ctf_stream_class *sc, - uint64_t stream_instance_id, - ctf_fs_ds_index index) -{ - ctf_fs_ds_file_group::UP ds_file_group {new ctf_fs_ds_file_group}; - - ds_file_group->index = std::move(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; - - return ds_file_group; -} - void ctf_fs_ds_file_group::insert_ds_file_info_sorted(ctf_fs_ds_file_info::UP ds_file_info) { /* Find the spot where to insert this ds_file_info. */ diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp index f27dbde7..e00a5cc4 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.hpp +++ b/src/plugins/ctf/fs-src/data-stream-file.hpp @@ -121,6 +121,16 @@ struct ctf_fs_ds_file_group { using UP = std::unique_ptr; + explicit ctf_fs_ds_file_group(struct ctf_fs_trace * const trace, + ctf_stream_class * const scParam, const uint64_t streamInstanceId, + ctf_fs_ds_index indexParam) noexcept : + + sc {scParam}, + stream_id(streamInstanceId), ctf_fs_trace {trace}, index {std::move(indexParam)} + + { + } + /* * Insert ds_file_info in the list of ds_file_infos at the right * place to keep it sorted. @@ -159,11 +169,6 @@ bt2s::optional ctf_fs_ds_file_build_index(struct ctf_fs_ds_file 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, - struct ctf_stream_class *sc, - uint64_t stream_instance_id, - ctf_fs_ds_index index); - /* * Medium operations to iterate on a single ctf_fs_ds_file. * diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 02cf97df..09f663e3 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -470,15 +470,9 @@ 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. */ - auto new_ds_file_group = - ctf_fs_ds_file_group_create(ctf_fs_trace, sc, UINT64_C(-1), std::move(*index)); - - if (!new_ds_file_group) { - return -1; - } - - new_ds_file_group->insert_ds_file_info_sorted(std::move(ds_file_info)); - ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group)); + ctf_fs_trace->ds_file_groups.emplace_back(bt2s::make_unique( + ctf_fs_trace, sc, UINT64_C(-1), std::move(*index))); + ctf_fs_trace->ds_file_groups.back()->insert_ds_file_info_sorted(std::move(ds_file_info)); return 0; } @@ -494,17 +488,10 @@ 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; - 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) { - return -1; - } - - ds_file_group = new_ds_file_group.get(); - ctf_fs_trace->ds_file_groups.emplace_back(std::move(new_ds_file_group)); + ctf_fs_trace->ds_file_groups.emplace_back(bt2s::make_unique( + ctf_fs_trace, sc, static_cast(stream_instance_id), std::move(*index))); + ds_file_group = ctf_fs_trace->ds_file_groups.back().get(); } else { merge_ctf_fs_ds_indexes(ds_file_group->index, *index); } @@ -786,15 +773,9 @@ static int merge_matching_ctf_fs_ds_file_groups(struct ctf_fs_trace *dest_trace, dest_trace->metadata->tc, src_group->sc->id); BT_ASSERT(sc); - auto new_dest_group = - ctf_fs_ds_file_group_create(dest_trace, sc, src_group->stream_id, {}); - - if (!new_dest_group) { - return -1; - } - - dest_group = new_dest_group.get(); - dest_trace->ds_file_groups.emplace_back(std::move(new_dest_group)); + dest_trace->ds_file_groups.emplace_back(bt2s::make_unique( + dest_trace, sc, src_group->stream_id, ctf_fs_ds_index {})); + dest_group = dest_trace->ds_file_groups.back().get(); } BT_ASSERT(dest_group); -- 2.34.1