src.ctf.lttng-live: add lttng_live_stream_iterator destructor

[babeltrace.git] / src / plugins / ctf / lttng-live / data-stream.cpp

diff --git a/src/plugins/ctf/lttng-live/data-stream.cpp b/src/plugins/ctf/lttng-live/data-stream.cpp
index 5ba068c379eb1c372ff5382aa844d9916fe82f78..49915d2c2d9bf4a4dc58b1fda3e7bd88ae87df39 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.cpp
+++ b/src/plugins/ctf/lttng-live/data-stream.cpp
@@ -7,8 +7,9 @@
  * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
  */
 
+#include <sstream>
+
 #include <glib.h>
-#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -49,11 +50,11 @@ static enum ctf_msg_iter_medium_status medop_request_bytes(size_t request_sz, ui
         goto end;
     }
 
-    read_len = MIN(request_sz, stream->buflen);
+    read_len = MIN(request_sz, stream->buf.size());
     read_len = MIN(read_len, len_left);
-    status = lttng_live_get_stream_bytes(live_msg_iter, stream, stream->buf, stream->offset,
+    status = lttng_live_get_stream_bytes(live_msg_iter, stream, stream->buf.data(), stream->offset,
                                          read_len, &recv_len);
-    *buffer_addr = stream->buf;
+    *buffer_addr = stream->buf.data();
     *buffer_sz = recv_len;
     stream->offset += recv_len;
 end:
@@ -69,7 +70,9 @@ static bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t str
 
         BT_CPPLOGI_SPEC(lttng_live_stream->logger,
                         "Creating stream {} (ID: {}) out of stream class {}",
-                        lttng_live_stream->name->str, stream_id, stream_class_id);
+                        lttng_live_stream->name, stream_id, stream_class_id);
+
+        bt_stream *stream;
 
         if (stream_id < 0) {
             /*
@@ -78,26 +81,28 @@ static bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t str
              * LTTng. In these cases, use the viewer_stream_id that
              * is unique for a live viewer session.
              */
-            lttng_live_stream->stream = bt_stream_create_with_id(
-                stream_class, lttng_live_stream->trace->trace, lttng_live_stream->viewer_stream_id);
+            stream =
+                bt_stream_create_with_id(stream_class, lttng_live_stream->trace->trace->libObjPtr(),
+                                         lttng_live_stream->viewer_stream_id);
         } else {
-            lttng_live_stream->stream = bt_stream_create_with_id(
-                stream_class, lttng_live_stream->trace->trace, (uint64_t) stream_id);
+            stream = bt_stream_create_with_id(
+                stream_class, lttng_live_stream->trace->trace->libObjPtr(), (uint64_t) stream_id);
         }
 
-        if (!lttng_live_stream->stream) {
+        if (!stream) {
             BT_CPPLOGE_APPEND_CAUSE_SPEC(
                 lttng_live_stream->logger,
                 "Cannot create stream {} (stream class ID {}, stream ID {})",
-                lttng_live_stream->name->str, stream_class_id, stream_id);
-            goto end;
+                lttng_live_stream->name, stream_class_id, stream_id);
+            return nullptr;
         }
 
-        bt_stream_set_name(lttng_live_stream->stream, lttng_live_stream->name->str);
+        lttng_live_stream->stream = bt2::Stream::Shared::createWithoutRef(stream);
+
+        lttng_live_stream->stream->name(lttng_live_stream->name);
     }
 
-end:
-    return lttng_live_stream->stream;
+    return lttng_live_stream->stream->libObjPtr();
 }
 
 static struct ctf_msg_iter_medium_ops medops = {
@@ -140,7 +145,7 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_sessi
             BT_CPPLOGD_SPEC(stream_iter->logger,
                             "Creating CTF message iterator: session-id={}, ctf-tc-addr={}, "
                             "stream-iter-name={}, self-msg-iter-addr={}",
-                            session->id, fmt::ptr(ctf_tc), stream_iter->name->str,
+                            session->id, fmt::ptr(ctf_tc), stream_iter->name,
                             fmt::ptr(self_msg_iter));
             stream_iter->msg_iter =
                 ctf_msg_iter_create(ctf_tc, lttng_live->max_query_size, medops, stream_iter,
@@ -166,6 +171,7 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c
                                   uint64_t stream_id, bt_self_message_iterator *self_msg_iter)
 {
     lttng_live_stream_iterator *stream_iter = nullptr;
+    std::stringstream nameSs;
 
     BT_ASSERT(session);
     BT_ASSERT(session->lttng_live_msg_iter);
@@ -203,23 +209,10 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c
             goto error;
         }
     }
-    stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size);
-    if (!stream_iter->buf) {
-        BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
-                                     "Failed to allocate live stream iterator buffer");
-        goto error;
-    }
+    stream_iter->buf.resize(lttng_live->max_query_size);
 
-    stream_iter->buflen = lttng_live->max_query_size;
-    stream_iter->name = g_string_new(NULL);
-    if (!stream_iter->name) {
-        BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
-                                     "Failed to allocate live stream iterator name buffer");
-        goto error;
-    }
-
-    g_string_printf(stream_iter->name, STREAM_NAME_PREFIX "%" PRIu64,
-                    stream_iter->viewer_stream_id);
+    nameSs << STREAM_NAME_PREFIX << stream_iter->viewer_stream_id;
+    stream_iter->name = nameSs.str();
     g_ptr_array_add(trace->stream_iterators, stream_iter);
 
     /* Track the number of active stream iterator. */
@@ -227,34 +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;
-    }
-
-    if (stream_iter->stream) {
-        BT_STREAM_PUT_REF_AND_RESET(stream_iter->stream);
-    }
-
-    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);
-    }
-
-    bt_message_put_ref(stream_iter->current_msg);
-
     /* 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;
 }