src.ctf.lttng-live: add lttng_live_stream_iterator destructor

lttng_live_stream_iterator_destroy is still used for a GPtrArray, so it
is kept as a wrapper to the destructor for now.

Change-Id: Idc3fb90f2b15f44d92d9edd578783f4939474fdf
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8459
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12375
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/plugins/ctf/lttng-live/data-stream.cpp b/src/plugins/ctf/lttng-live/data-stream.cpp
index cf9771ae30c75fd8932d56766af81b144942336b..49915d2c2d9bf4a4dc58b1fda3e7bd88ae87df39 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.cpp
+++ b/src/plugins/ctf/lttng-live/data-stream.cpp
@@ -220,20 +220,19 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c
 
     goto end;
 error:
-    lttng_live_stream_iterator_destroy(stream_iter);
+    delete stream_iter;
     stream_iter = NULL;
 end:
     return stream_iter;
 }
 
-void lttng_live_stream_iterator_destroy(struct lttng_live_stream_iterator *stream_iter)
+lttng_live_stream_iterator::~lttng_live_stream_iterator()
 {
-    if (!stream_iter) {
-        return;
-    }
-
     /* Track the number of active stream iterator. */
-    stream_iter->trace->session->lttng_live_msg_iter->active_stream_iter--;
+    this->trace->session->lttng_live_msg_iter->active_stream_iter--;
+}
 
+void lttng_live_stream_iterator_destroy(struct lttng_live_stream_iterator *stream_iter)
+{
     delete stream_iter;
 }

diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp
index 56c86d39a679cadbe995e585800588c5ea1efa0e..2ff02ee638556457ce1de524b0d746f495ea64fa 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -73,6 +73,8 @@ struct lttng_live_stream_iterator
     {
     }
 
+    ~lttng_live_stream_iterator();
+
     bt2c::Logger logger;
 
     bt2::Stream::Shared stream;