X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fmetadata.c;h=175b8071f0238098788d842b99ba3823e2a189b9;hb=b73700301e831acfc3d2828d22da60c3f62c497e;hp=7a7a0d8a445c59815ba85e8a540c33b447a48819;hpb=f79c2d7a3575db7cd07f502b39e1db76619b70a6;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index 7a7a0d8a..175b8071 100644
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -132,6 +132,8 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 	bt_self_component *self_comp = trace->self_comp;
 	enum lttng_live_get_one_metadata_status metadata_status;
 
+	BT_COMP_LOGD("Updating metadata for trace: trace-id=%"PRIu64, trace->id);
+
 	/* No metadata stream yet. */
 	if (!metadata) {
 		if (session->new_streams_needed) {
@@ -143,11 +145,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 		goto end;
 	}
 
-	if (!metadata->trace) {
-		trace->new_metadata_needed = false;
-	}
-
-	if (!trace->new_metadata_needed) {
+	if (trace->metadata_stream_state != LTTNG_LIVE_METADATA_STREAM_STATE_NEEDED) {
 		goto end;
 	}
 
@@ -196,28 +194,31 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 			keep_receiving = false;
 			break;
 		case LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED:
+			BT_COMP_LOGD("Metadata stream was closed by the Relay, the trace is no longer active: "
+				"trace-id=%"PRIu64", metadata-stream-id=%"PRIu64,
+				trace->id, metadata->stream_id);
+			/*
+			 * The stream was closed and we received everything
+			 * there was to receive for this metadata stream.
+			 * We go on with the decoding of what we received. So
+			 * that data stream can be decoded.
+			 */
 			keep_receiving = false;
+			trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_CLOSED;
 			break;
 		case LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR:
+			BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+				"Error getting one trace metadata packet: "
+				"trace-id=%"PRIu64, trace->id);
 			goto error;
 		default:
 			bt_common_abort();
 		}
 	}
 
-	/*
-	 * 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 (metadata_status == LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED) {
-		status = LTTNG_LIVE_ITERATOR_STATUS_END;
-		goto end;
-	}
-
 	/* The memory buffer `metadata_buf` contains all the metadata. */
 	if (bt_close_memstream(&metadata_buf, &size, fp)) {
-		BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
-			"Metadata bt_close_memstream", ".");
+		BT_COMP_LOGW_ERRNO("Metadata bt_close_memstream", ".");
 	}
 
 	fp = NULL;
@@ -227,7 +228,9 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 			status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
 			goto end;
 		}
-		trace->new_metadata_needed = false;
+
+		/* The relay sent zero bytes of metdata. */
+		trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED;
 		goto end;
 	}
 
@@ -253,6 +256,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 	 * The call to ctf_metadata_decoder_append_content() will append
 	 * new metadata to our current trace class.
 	 */
+	BT_COMP_LOGD("Appending new metadata to the ctf_trace class");
 	decoder_status = ctf_metadata_decoder_append_content(
 		metadata->decoder, fp);
 	switch (decoder_status) {
@@ -286,7 +290,9 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 			trace->clock_class =
 				borrow_any_clock_class(trace->trace_class);
 		}
-		trace->new_metadata_needed = false;
+
+		/* The metadata was updated succesfully. */
+		trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED;
 
 		break;
 	case CTF_METADATA_DECODER_STATUS_INCOMPLETE:
@@ -306,8 +312,7 @@ end:
 
 		closeret = fclose(fp);
 		if (closeret) {
-			BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
-				"Error on fclose", ".");
+			BT_COMP_LOGW_ERRNO("Error on fclose", ".");
 		}
 	}
 	free(metadata_buf);
@@ -351,7 +356,6 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
 			"Failed to borrow trace");
 		goto error;
 	}
-	metadata->trace = trace;
 	trace->metadata = metadata;
 	return 0;