X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fmetadata.c;h=df75b15f5e9410d10fb1f9c28d1985adad683526;hb=f797424a5aa3b965937203073b27d666c25a6987;hp=f8f2248048846ca0aeb3e1abd5e8ce36b52ea09c;hpb=b03487ab5e72f71a01bd7ac78dff3a420b5f9ef8;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index f8f22480..df75b15f 100644
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -24,8 +24,10 @@
  * SOFTWARE.
  */
 
+#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 "logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>
@@ -37,6 +39,7 @@
 
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
+#include "../common/metadata/ctf-meta-configure-ir-trace.h"
 
 #define TSDL_MAGIC	0x75d11d57
 
@@ -55,7 +58,9 @@ struct packet_header {
 
 
 static
-bool stream_classes_all_have_default_clock_class(bt_trace_class *tc)
+bool stream_classes_all_have_default_clock_class(bt_trace_class *tc,
+		bt_logging_level log_level,
+		bt_self_component *self_comp)
 {
 	uint64_t i, sc_count;
 	const bt_clock_class *cc = NULL;
@@ -71,7 +76,7 @@ bool stream_classes_all_have_default_clock_class(bt_trace_class *tc)
 		cc = bt_stream_class_borrow_default_clock_class_const(sc);
 		if (!cc) {
 			ret = false;
-			BT_LOGE("Stream class doesn't have a default clock class: "
+			BT_COMP_LOGE("Stream class doesn't have a default clock class: "
 				"sc-id=%" PRIu64 ", sc-name=\"%s\"",
 				bt_stream_class_get_id(sc),
 				bt_stream_class_get_name(sc));
@@ -97,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) {
@@ -105,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;
 }
 
@@ -115,15 +120,16 @@ 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;
+	bool keep_receiving;
 	FILE *fp = NULL;
 	enum ctf_metadata_decoder_status decoder_status;
 	enum lttng_live_iterator_status status =
 		LTTNG_LIVE_ITERATOR_STATUS_OK;
+	bt_logging_level log_level = trace->log_level;
+	bt_self_component *self_comp = trace->self_comp;
+	enum lttng_live_get_one_metadata_status metadata_status;
 
 	/* No metadata stream yet. */
 	if (!metadata) {
@@ -147,51 +153,59 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 	/* Open for writing */
 	fp = bt_open_memstream(&metadata_buf, &size);
 	if (!fp) {
-		BT_LOGE("Metadata open_memstream: %s", strerror(errno));
+		BT_COMP_LOGE("Metadata open_memstream: %s", strerror(errno));
 		goto error;
 	}
 
+	keep_receiving = true;
 	/* Grab all available metadata. */
-	do {
+	while (keep_receiving) {
+		size_t reply_len = 0;
 		/*
-		 * get_one_metadata_packet returns the number of bytes
-		 * received, 0 when we have received everything, a
-		 * negative value on error.
+		 * lttng_live_get_one_metadata_packet() asks the Relay Daemon
+		 * for new metadata. If new metadata is received, the function
+		 * writes it to the provided file handle and updates the
+		 * reply_len output parameter. We call this function in loop
+		 * until it returns _END meaning that no new metadata is
+		 * available.
+		 * We may receive a _CLOSED status if the metadata stream we
+		 * are requesting is no longer available on the relay.
+		 * If we receive an _ERROR status, it means there was a
+		 * networking, allocating, or some other unrecoverable error.
 		 */
-		ret = lttng_live_get_one_metadata_packet(trace, fp);
-		if (ret > 0) {
-			len_read += ret;
+		metadata_status = lttng_live_get_one_metadata_packet(trace, fp,
+			&reply_len);
+
+		switch (metadata_status) {
+		case LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK:
+			len_read += reply_len;
+			break;
+		case LTTNG_LIVE_GET_ONE_METADATA_STATUS_END:
+			keep_receiving = false;
+			break;
+		case LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED:
+			keep_receiving = false;
+			break;
+		case LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR:
+			goto error;
+		default:
+			abort();
 		}
-	} while (ret > 0);
+	}
 
 	/*
-	 * Consider metadata closed as soon as we get an error reading
-	 * it (e.g. cannot be found).
+	 * A closed metadata stream means the trace is no longer active. Return
+	 * _END so that the caller can remove the trace from its list.
 	 */
-	if (ret < 0) {
-		if (!metadata->closed) {
-			metadata->closed = true;
-			/*
-			 * Release our reference on the trace as soon as
-			 * we know the metadata stream is not available
-			 * anymore. This won't necessarily teardown the
-			 * metadata objects immediately, but only when
-			 * the data streams are done.
-			 */
-			metadata->trace = NULL;
-		}
-		if (errno == EINTR) {
-			if (lttng_live_graph_is_canceled(lttng_live)) {
-				status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
-				goto end;
-			}
-		}
+	if (metadata_status == LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED) {
+		status = LTTNG_LIVE_ITERATOR_STATUS_END;
+		goto end;
 	}
 
 	if (bt_close_memstream(&metadata_buf, &size, fp)) {
-		BT_LOGE("bt_close_memstream: %s", strerror(errno));
+		BT_COMP_LOGE("bt_close_memstream: %s", strerror(errno));
 	}
-	ret = 0;
+
 	fp = NULL;
 
 	if (len_read == 0) {
@@ -205,25 +219,38 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 
 	fp = bt_fmemopen(metadata_buf, len_read, "rb");
 	if (!fp) {
-		BT_LOGE("Cannot memory-open metadata buffer: %s",
+		BT_COMP_LOGE("Cannot memory-open metadata buffer: %s",
 			strerror(errno));
 		goto error;
 	}
 
 	/*
-	 * 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) {
+			struct ctf_trace_class *tc =
+				ctf_metadata_decoder_borrow_ctf_trace_class(
+					metadata->decoder);
+
 			trace->trace_class =
 				ctf_metadata_decoder_get_ir_trace_class(
 						metadata->decoder);
 			trace->trace = bt_trace_create(trace->trace_class);
+			if (!trace->trace) {
+				goto error;
+			}
+			if (ctf_trace_class_configure_ir_trace(tc,
+					trace->trace)) {
+				goto error;
+			}
 			if (!stream_classes_all_have_default_clock_class(
-					trace->trace_class)) {
+					trace->trace_class, log_level,
+					self_comp)) {
 				/* Error logged in function. */
 				goto error;
 			}
@@ -236,22 +263,27 @@ 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;
 	}
 
 	goto end;
+
 error:
-	status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
+	if (errno == EINTR) {
+		if (lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
+			status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
+		}
+	} else {
+		status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
+	}
 end:
 	if (fp) {
 		int closeret;
 
 		closeret = fclose(fp);
 		if (closeret) {
-			BT_LOGE("Error on fclose");
+			BT_COMP_LOGE("Error on fclose");
 		}
 	}
 	free(metadata_buf);
@@ -260,29 +292,28 @@ end:
 
 BT_HIDDEN
 int lttng_live_metadata_create_stream(struct lttng_live_session *session,
-		uint64_t ctf_trace_id,
-		uint64_t stream_id,
+		uint64_t ctf_trace_id, uint64_t stream_id,
 		const char *trace_name)
 {
-	struct lttng_live_component *lttng_live =
-		session->lttng_live_msg_iter->lttng_live_comp;
 	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);
 	if (!metadata) {
 		return -1;
 	}
+	metadata->log_level = session->log_level;
+	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(
-				lttng_live->self_comp, NULL);
+	metadata->decoder = ctf_metadata_decoder_create(&cfg);
 	if (!metadata->decoder) {
 		goto error;
 	}