Cleanup: src.ctf.lttng-live: add missing `#include <stdint.h>`

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

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index 04496b81530ffcec61c86e773933ad78d6d5b13c..61777519e7819e1f4253f9b02b1c2ded3c907dd7 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -28,17 +28,17 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
 #include "logging/comp-logging.h"
 
+#include <inttypes.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
-#include <stdbool.h>
+
 #include <glib.h>
-#include <inttypes.h>
-#include "compat/mman.h"
+
 #include <babeltrace2/babeltrace.h>
+
 #include "../common/msg-iter/msg-iter.h"
 #include "common/assert.h"
-
+#include "compat/mman.h"
 #include "data-stream.h"
 
 #define STREAM_NAME_PREFIX     "stream-"
@@ -114,7 +114,8 @@ bt_stream *medop_borrow_stream(bt_stream_class *stream_class,
                }
 
                if (!lttng_live_stream->stream) {
-                       BT_COMP_LOGE("Cannot create stream %s (stream class ID "
+                       BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                               "Cannot create stream %s (stream class ID "
                                "%" PRId64 ", stream ID %" PRIu64 ")",
                                lttng_live_stream->name->str,
                                stream_class_id, stream_id);
@@ -159,19 +160,26 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(
                        struct ctf_trace_class *ctf_tc;
                        struct lttng_live_stream_iterator *stream_iter =
                                g_ptr_array_index(trace->stream_iterators,
-                                               stream_iter_idx);
+                                       stream_iter_idx);
 
                        if (stream_iter->msg_iter) {
                                continue;
                        }
                        ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class(
-                                               trace->metadata->decoder);
+                               trace->metadata->decoder);
                        stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
-                                       lttng_live->max_query_size, medops,
-                                       stream_iter, log_level, self_comp);
+                               lttng_live->max_query_size, medops, stream_iter,
+                               log_level, self_comp);
                        if (!stream_iter->msg_iter) {
+                               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                                       "Failed to create CTF message iterator");
                                goto error;
                        }
+
+                       bt_msg_iter_set_emit_stream_end_message(
+                               stream_iter->msg_iter, true);
+                       bt_msg_iter_set_emit_stream_beginning_message(
+                               stream_iter->msg_iter, true);
                }
        }
 
@@ -205,6 +213,8 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
 
        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;
        }
 
@@ -212,6 +222,8 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
        stream_iter->self_comp = self_comp;
        trace = lttng_live_borrow_trace(session, ctf_trace_id);
        if (!trace) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                       "Failed to borrow CTF trace.");
                goto error;
        }
 
@@ -224,28 +236,39 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
        if (trace->trace) {
                struct ctf_trace_class *ctf_tc =
                        ctf_metadata_decoder_borrow_ctf_trace_class(
-                                       trace->metadata->decoder);
+                               trace->metadata->decoder);
                BT_ASSERT(!stream_iter->msg_iter);
                stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
-                               lttng_live->max_query_size, medops,
-                               stream_iter, log_level, self_comp);
+                       lttng_live->max_query_size, medops, stream_iter,
+                       log_level, self_comp);
                if (!stream_iter->msg_iter) {
+                       BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                               "Failed to create CTF message iterator");
                        goto error;
                }
+
+               bt_msg_iter_set_emit_stream_end_message(
+                       stream_iter->msg_iter, true);
+               bt_msg_iter_set_emit_stream_beginning_message(
+                       stream_iter->msg_iter, true);
        }
        stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size);
        if (!stream_iter->buf) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                       "Failed to allocate live stream iterator buffer");
                goto error;
        }
 
        stream_iter->buflen = lttng_live->max_query_size;
        stream_iter->name = g_string_new(NULL);
        if (!stream_iter->name) {
+               BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+                       "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);
+               stream_iter->viewer_stream_id);
        g_ptr_array_add(trace->stream_iterators, stream_iter);
 
        /* Track the number of active stream iterator. */