src.ctf.lttng-live: make lttng_live_stream_iterator::msg_iter a ctf_msg_iter_up

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

diff --git a/src/plugins/ctf/lttng-live/data-stream.cpp b/src/plugins/ctf/lttng-live/data-stream.cpp
index a58551ee02155c971835ed1dcb986f8975995f4b..d88921ea7f9e291138ff7c9f593e41dc75a14dba 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.cpp
+++ b/src/plugins/ctf/lttng-live/data-stream.cpp
@@ -152,8 +152,7 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_sessi
                      "stream-iter-name=%s, self-msg-iter-addr=%p",
                      session->id, ctf_tc, stream_iter->name->str, self_msg_iter);
             stream_iter->msg_iter = ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops,
-                                                        stream_iter, self_msg_iter, logCfg)
-                                        .release();
+                                                        stream_iter, self_msg_iter, logCfg);
             if (!stream_iter->msg_iter) {
                 BT_CLOGE_APPEND_CAUSE("Failed to create CTF message iterator");
                 goto error;
@@ -207,8 +206,7 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c
             ctf_metadata_decoder_borrow_ctf_trace_class(trace->metadata->decoder.get());
         BT_ASSERT(!stream_iter->msg_iter);
         stream_iter->msg_iter = ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops,
-                                                    stream_iter, self_msg_iter, logCfg)
-                                    .release();
+                                                    stream_iter, self_msg_iter, logCfg);
         if (!stream_iter->msg_iter) {
             BT_CLOGE_APPEND_CAUSE("Failed to create CTF message iterator");
             goto error;
@@ -249,9 +247,6 @@ void lttng_live_stream_iterator_destroy(struct lttng_live_stream_iterator *strea
         return;
     }
 
-    if (stream_iter->msg_iter) {
-        ctf_msg_iter_destroy(stream_iter->msg_iter);
-    }
     g_free(stream_iter->buf);
     if (stream_iter->name) {
         g_string_free(stream_iter->name, TRUE);

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index cddd7ca0b40da7bef89880028a6060132598887d..a37cbfa1fdbc6dcf95d77e17da6c5cdd996567a6 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -791,7 +791,7 @@ static enum lttng_live_iterator_status lttng_live_iterator_next_handle_one_activ
         goto end;
     }
 
-    status = ctf_msg_iter_get_next_message(lttng_live_stream->msg_iter, message);
+    status = ctf_msg_iter_get_next_message(lttng_live_stream->msg_iter.get(), message);
     switch (status) {
     case CTF_MSG_ITER_STATUS_EOF:
         ret = LTTNG_LIVE_ITERATOR_STATUS_END;
@@ -812,7 +812,8 @@ static enum lttng_live_iterator_status lttng_live_iterator_next_handle_one_activ
         ret = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
         BT_CLOGE_APPEND_CAUSE("CTF message iterator failed to get next message: "
                               "msg-iter=%p, msg-iter-status=%s",
-                              lttng_live_stream->msg_iter, ctf_msg_iter_status_string(status));
+                              lttng_live_stream->msg_iter.get(),
+                              ctf_msg_iter_status_string(status));
         break;
     }
 
@@ -838,7 +839,7 @@ lttng_live_iterator_close_stream(struct lttng_live_msg_iter *lttng_live_msg_iter
      * stream properly by emitting the necessary stream end message.
      */
     enum ctf_msg_iter_status status =
-        ctf_msg_iter_get_next_message(stream_iter->msg_iter, curr_msg);
+        ctf_msg_iter_get_next_message(stream_iter->msg_iter.get(), curr_msg);
 
     if (status == CTF_MSG_ITER_STATUS_ERROR) {
         BT_CLOGE_APPEND_CAUSE("Error getting the next message from CTF message iterator");

diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp
index 9f7d25346e1612a6ccf46b906a135155162a5057..508c5d2bfc8ad3bc7501fd5db3aebd1af30a6e8f 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.hpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.hpp
@@ -67,7 +67,7 @@ struct lttng_live_stream_iterator
      * Since only a single iterator per viewer connection, we have
      * only a single message iterator per stream.
      */
-    struct ctf_msg_iter *msg_iter = nullptr;
+    ctf_msg_iter_up msg_iter;
 
     uint64_t viewer_stream_id = 0;