ctf: allocate some structures with new

[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 9ad1e9ef8412186cb8ef465d75cbe5d873857492..e0dca4530f49858a2c4f1c8ffa3432e16b25f4ed 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.cpp
+++ b/src/plugins/ctf/lttng-live/data-stream.cpp
@@ -13,17 +13,22 @@
 
 #include <babeltrace2/babeltrace.h>
 
-#include "plugins/ctf/common/metadata/decoder.hpp"
-
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL   log_level
 #define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
+#include <glib.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <babeltrace2/babeltrace.h>
+
 #include "logging/comp-logging.h"
 
 #include "common/assert.h"
-#include "compat/mman.h"
+#include "compat/mman.h" /* IWYU pragma: keep  */
 
-#include "../common/msg-iter/msg-iter.hpp"
+#include "../common/src/msg-iter/msg-iter.hpp"
 #include "data-stream.hpp"
 
 #define STREAM_NAME_PREFIX "stream-"
@@ -171,7 +176,6 @@ struct lttng_live_stream_iterator *
 lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t ctf_trace_id,
                                   uint64_t stream_id, bt_self_message_iterator *self_msg_iter)
 {
-    struct lttng_live_stream_iterator *stream_iter;
     struct lttng_live_component *lttng_live;
     struct lttng_live_trace *trace;
     bt_logging_level log_level;
@@ -185,13 +189,7 @@ lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t c
 
     lttng_live = session->lttng_live_msg_iter->lttng_live_comp;
 
-    stream_iter = g_new0(struct lttng_live_stream_iterator, 1);
-    if (!stream_iter) {
-        BT_COMP_LOGE_APPEND_CAUSE(self_comp,
-                                  "Failed to allocate struct lttng_live_stream_iterator");
-        goto error;
-    }
-
+    lttng_live_stream_iterator *stream_iter = new lttng_live_stream_iterator;
     stream_iter->log_level = log_level;
     stream_iter->self_comp = self_comp;
     trace = lttng_live_session_borrow_or_create_trace_by_id(session, ctf_trace_id);
@@ -273,5 +271,5 @@ void lttng_live_stream_iterator_destroy(struct lttng_live_stream_iterator *strea
     /* Track the number of active stream iterator. */
     stream_iter->trace->session->lttng_live_msg_iter->active_stream_iter--;
 
-    g_free(stream_iter);
+    delete stream_iter;
 }