X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fmetadata.c;h=f77d62f8baf74d1ce049b1e35cb201b10563f03a;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=db1dfd7d41025c076dac324fc107f09ff9e745c2;hpb=be5d04a69d871a17842af4cbf8421be7a9d5bbbb;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index db1dfd7d..f77d62f8 100644
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -102,7 +102,7 @@ const bt_clock_class *borrow_any_clock_class(bt_trace_class *tc)
 	sc_count = bt_trace_class_get_stream_class_count(tc);
 	for (i = 0; i < sc_count; i++) {
 		sc = bt_trace_class_borrow_stream_class_by_index_const(tc, i);
-		BT_ASSERT(sc);
+		BT_ASSERT_DBG(sc);
 
 		cc = bt_stream_class_borrow_default_clock_class_const(sc);
 		if (cc) {
@@ -110,7 +110,7 @@ const bt_clock_class *borrow_any_clock_class(bt_trace_class *tc)
 		}
 	}
 end:
-	BT_ASSERT(cc);
+	BT_ASSERT_DBG(cc);
 	return cc;
 }
 
@@ -197,7 +197,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 	if (bt_close_memstream(&metadata_buf, &size, fp)) {
 		BT_COMP_LOGE("bt_close_memstream: %s", strerror(errno));
 	}
-	ret = 0;
+
 	fp = NULL;
 
 	if (len_read == 0) {
@@ -217,10 +217,11 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 	}
 
 	/*
-	 * The call to ctf_metadata_decoder_decode will append new metadata to
-	 * our current trace class.
+	 * The call to ctf_metadata_decoder_append_content() will append
+	 * new metadata to our current trace class.
 	 */
-	decoder_status = ctf_metadata_decoder_decode(metadata->decoder, fp);
+	decoder_status = ctf_metadata_decoder_append_content(
+		metadata->decoder, fp);
 	switch (decoder_status) {
 	case CTF_METADATA_DECODER_STATUS_OK:
 		if (!trace->trace_class) {
@@ -254,9 +255,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 	case CTF_METADATA_DECODER_STATUS_INCOMPLETE:
 		status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
 		break;
-	case CTF_METADATA_DECODER_STATUS_ERROR:
-	case CTF_METADATA_DECODER_STATUS_INVAL_VERSION:
-	case CTF_METADATA_DECODER_STATUS_IR_VISITOR_ERROR:
+	default:
 		goto error;
 	}
 
@@ -288,6 +287,7 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
 		.self_comp = session->self_comp,
 		.clock_class_offset_s = 0,
 		.clock_class_offset_ns = 0,
+		.create_trace_class = true,
 	};
 
 	metadata = g_new0(struct lttng_live_metadata, 1);