X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fdata-stream.c;h=61777519e7819e1f4253f9b02b1c2ded3c907dd7;hb=3c22a2420b7a79eb5bce946bcf314349d2ebfe14;hp=6021c06580e33ebdedcc8977b033cce4e43426d6;hpb=0f1979c3efe2c5b253edb5944d2ba561347ece2e;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index 6021c065..61777519 100644
--- 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);
@@ -170,6 +171,8 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(
 				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;
 			}
 
@@ -210,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;
 	}
 
@@ -217,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;
 	}
 
@@ -235,6 +242,8 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
 			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;
 		}
 
@@ -245,12 +254,16 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
 	}
 	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;
 	}