From 8ad3f6e09c998f14f23faf853a69716214755dd8 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 7 Dec 2023 15:49:29 +0000 Subject: [PATCH] src.ctf.lttng-live: add lttng_live_msg_iter destructor Convert lttng_live_msg_iter_destroy to a destructor. Change-Id: I4bd28e540517e11ede6c210c7645db98951c31f8 Reviewed-on: https://review.lttng.org/c/babeltrace/+/8473 Reviewed-by: Philippe Proulx Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/12388 Tested-by: jenkins --- src/plugins/ctf/lttng-live/lttng-live.cpp | 23 +++++++---------------- src/plugins/ctf/lttng-live/lttng-live.hpp | 2 ++ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp index f5601842..43ae552a 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.cpp +++ b/src/plugins/ctf/lttng-live/lttng-live.cpp @@ -156,23 +156,14 @@ lttng_live_session::~lttng_live_session() } } -static void lttng_live_msg_iter_destroy(struct lttng_live_msg_iter *lttng_live_msg_iter) +lttng_live_msg_iter::~lttng_live_msg_iter() { - if (!lttng_live_msg_iter) { - goto end; - } - - BT_ASSERT(lttng_live_msg_iter->lttng_live_comp); - BT_ASSERT(lttng_live_msg_iter->lttng_live_comp->has_msg_iter); + BT_ASSERT(this->lttng_live_comp); + BT_ASSERT(this->lttng_live_comp->has_msg_iter); /* All stream iterators must be destroyed at this point. */ - BT_ASSERT(lttng_live_msg_iter->active_stream_iter == 0); - lttng_live_msg_iter->lttng_live_comp->has_msg_iter = false; - - delete lttng_live_msg_iter; - -end: - return; + BT_ASSERT(this->active_stream_iter == 0); + this->lttng_live_comp->has_msg_iter = false; } void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter) @@ -184,7 +175,7 @@ void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter) lttng_live_msg_iter = (struct lttng_live_msg_iter *) bt_self_message_iterator_get_data(self_msg_iter); BT_ASSERT(lttng_live_msg_iter); - lttng_live_msg_iter_destroy(lttng_live_msg_iter); + delete lttng_live_msg_iter; } static enum lttng_live_iterator_status @@ -1695,7 +1686,7 @@ lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it, goto end; error: - lttng_live_msg_iter_destroy(lttng_live_msg_iter); + delete lttng_live_msg_iter; end: return status; } catch (const std::bad_alloc&) { diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp index a4cc7cc5..7018888a 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.hpp +++ b/src/plugins/ctf/lttng-live/lttng-live.hpp @@ -284,6 +284,8 @@ struct lttng_live_msg_iter { } + ~lttng_live_msg_iter(); + bt2c::Logger logger; bt_self_component *self_comp = nullptr; -- 2.34.1