From 537fddc01ab951c8cad09d9f4bfa91a66bc70c4e Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 9 Dec 2023 16:26:12 +0000 Subject: [PATCH] src.ctf.fs: make ctf_fs_msg_iter_data::msg_iter a ctf_msg_iter_up Change-Id: I44ef5f74fdee99a4bf5962cf03757acc7ba774b2 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8276 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12314 Tested-by: jenkins --- src/plugins/ctf/fs-src/fs.cpp | 23 ++++++++--------------- src/plugins/ctf/fs-src/fs.hpp | 3 +-- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 490de46d..8e781665 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -41,10 +41,6 @@ static void ctf_fs_msg_iter_data_destroy(struct ctf_fs_msg_iter_data *msg_iter_d return; } - if (msg_iter_data->msg_iter) { - ctf_msg_iter_destroy(msg_iter_data->msg_iter); - } - delete msg_iter_data; } @@ -52,9 +48,8 @@ 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: @@ -168,7 +163,7 @@ 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_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; @@ -232,13 +227,11 @@ ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter, goto error; } - 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.get(), self_msg_iter, - msg_iter_data->logger) - .release(); + 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.get(), self_msg_iter, + msg_iter_data->logger); if (!msg_iter_data->msg_iter) { BT_CPPLOGE_APPEND_CAUSE_SPEC(msg_iter_data->logger, "Cannot create a CTF message iterator."); diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp index 87d649a2..9058c793 100644 --- a/src/plugins/ctf/fs-src/fs.hpp +++ b/src/plugins/ctf/fs-src/fs.hpp @@ -115,8 +115,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 -- 2.34.1