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 <eeppeliteloop@gmail.com>
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12388
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index f56018422434c9826ebd153129d6ef9bb73b0abe..43ae552a99100dc10380c609cbe6c653739c7031 100644 (file)
--- 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 a4cc7cc58ad5cadf9e1b8788bb44885c50ffde25..7018888a7a5039895dc1469343a3a5a8b2e330ab 100644 (file)
--- 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;