X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fdata-stream.c;h=7e7250baf94b46922de642fc894c777908f5cffc;hb=c01594dea908eeacf22c4d8bf5c4e629792a91d5;hp=25a8e4cf1e66bdea7b9c18d4a52f9ada2a381bfd;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index 25a8e4cf..7e7250ba 100644
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -23,8 +23,9 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC-DS"
-#include "logging.h"
+#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
+#include "logging/log.h"
 
 #include <stdio.h>
 #include <stdint.h>
@@ -78,11 +79,12 @@ bt_stream *medop_borrow_stream(bt_stream_class *stream_class,
 		int64_t stream_id, void *data)
 {
 	struct lttng_live_stream_iterator *lttng_live_stream = data;
+	bt_logging_level log_level = lttng_live_stream->log_level;
 
 	if (!lttng_live_stream->stream) {
 		uint64_t stream_class_id = bt_stream_class_get_id(stream_class);
 
-		BT_LOGD("Creating stream %s (ID: %" PRIu64 ") out of stream "
+		BT_LOGI("Creating stream %s (ID: %" PRIu64 ") out of stream "
 			"class %" PRId64, lttng_live_stream->name->str,
 			stream_id, stream_class_id);
 
@@ -128,6 +130,7 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(
 	struct lttng_live_component *lttng_live =
 		session->lttng_live_msg_iter->lttng_live_comp;
 	uint64_t trace_idx, stream_iter_idx;
+	bt_logging_level log_level = session->log_level;
 
 	if (!session->lazy_stream_msg_init) {
 		return LTTNG_LIVE_ITERATOR_STATUS_OK;
@@ -152,7 +155,7 @@ enum lttng_live_iterator_status lttng_live_lazy_msg_init(
 						trace->metadata->decoder);
 			stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
 					lttng_live->max_query_size, medops,
-					stream_iter);
+					stream_iter, log_level);
 			if (!stream_iter->msg_iter) {
 				goto error;
 			}
@@ -176,10 +179,12 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
 	struct lttng_live_stream_iterator *stream_iter;
 	struct lttng_live_component *lttng_live;
 	struct lttng_live_trace *trace;
+	bt_logging_level log_level;
 
 	BT_ASSERT(session);
 	BT_ASSERT(session->lttng_live_msg_iter);
 	BT_ASSERT(session->lttng_live_msg_iter->lttng_live_comp);
+	log_level = session->log_level;
 
 	lttng_live = session->lttng_live_msg_iter->lttng_live_comp;
 
@@ -188,6 +193,7 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
 		goto error;
 	}
 
+	stream_iter->log_level = log_level;
 	trace = lttng_live_borrow_trace(session, ctf_trace_id);
 	if (!trace) {
 		goto error;
@@ -206,7 +212,7 @@ struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
 		BT_ASSERT(!stream_iter->msg_iter);
 		stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
 				lttng_live->max_query_size, medops,
-				stream_iter);
+				stream_iter, log_level);
 		if (!stream_iter->msg_iter) {
 			goto error;
 		}