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>

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index 180932fa19f4e97e7b53d9e2f901d438f7d6ff1d..ddae6234c66ee454c0667116c9736ca470d6c0fe 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -216,23 +216,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;
 }
 
 BT_HIDDEN
@@ -245,7 +236,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
@@ -1750,7 +1741,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 cab7dadd11e577b154137fc179d651ef5bfdbab5..c34abcc8d056983b6a4c9670f2e04fa38201f04d 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -271,6 +271,8 @@ struct lttng_live_msg_iter
     {
     }
 
+    ~lttng_live_msg_iter();
+
     const bt2_common::LogCfg logCfg;
 
     bt_self_component *self_comp = nullptr;