X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fmetadata.c;h=61227141b4079883e6aeee25262dab7c0fb277a4;hb=526c3a49301fca7a698fc681e3e314e9960cea98;hp=8475c569633bd022170793dbf5003a1118a90d2d;hpb=cd03c43c9c60177a6b0cb2496a784bfefca9740f;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index 8475c569..61227141 100644
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/META"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>
@@ -120,8 +120,6 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 {
 	struct lttng_live_session *session = trace->session;
 	struct lttng_live_metadata *metadata = trace->metadata;
-	struct lttng_live_component *lttng_live =
-		session->lttng_live_msg_iter->lttng_live_comp;
 	ssize_t ret = 0;
 	size_t size, len_read = 0;
 	char *metadata_buf = NULL;
@@ -188,7 +186,8 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 			metadata->trace = NULL;
 		}
 		if (errno == EINTR) {
-			if (lttng_live_graph_is_canceled(lttng_live)) {
+			if (lttng_live_graph_is_canceled(
+					session->lttng_live_msg_iter)) {
 				status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
 				goto end;
 			}
@@ -218,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) {
@@ -284,12 +284,12 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
 {
 	struct lttng_live_metadata *metadata = NULL;
 	struct lttng_live_trace *trace;
-	const char *match;
 	struct ctf_metadata_decoder_config cfg = {
 		.log_level = session->log_level,
 		.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);
@@ -300,11 +300,6 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
 	metadata->self_comp = session->self_comp;
 	metadata->stream_id = stream_id;
 
-	match = strstr(trace_name, session->session_name->str);
-	if (!match) {
-		goto error;
-	}
-
 	metadata->decoder = ctf_metadata_decoder_create(&cfg);
 	if (!metadata->decoder) {
 		goto error;