X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=6e99a7f52d0d24ac1473db3f1c2bf12880a8df78;hb=75d83e506938a3e673ad19bb11838ee88e977e72;hp=57e26dcf86c869982e579e86b73ea3a663c75052;hpb=a9838785aecf564595c531772f7ca906b658afa0;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 57e26dcf8..6e99a7f52 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -491,6 +491,7 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 	stream->net_seq_idx = relayd_id;
 	stream->session_id = session_id;
 	stream->monitor = monitor;
+	stream->endpoint_status = CONSUMER_ENDPOINT_ACTIVE;
 	pthread_mutex_init(&stream->lock, NULL);
 
 	/* If channel is the metadata, flag this stream as metadata. */
@@ -1152,6 +1153,7 @@ struct lttng_consumer_local_data *lttng_consumer_create(
 
 	ctx->consumer_error_socket = -1;
 	ctx->consumer_metadata_socket = -1;
+	pthread_mutex_init(&ctx->metadata_socket_lock, NULL);
 	/* assign the callbacks */
 	ctx->on_buffer_ready = buffer_ready;
 	ctx->on_recv_channel = recv_channel;
@@ -1879,6 +1881,13 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 		break;
 	case LTTNG_CONSUMER32_UST:
 	case LTTNG_CONSUMER64_UST:
+		if (stream->monitor) {
+			/* close the write-side in close_metadata */
+			ret = close(stream->ust_metadata_poll_pipe[0]);
+			if (ret < 0) {
+				PERROR("Close UST metadata read-side poll pipe");
+			}
+		}
 		lttng_ustconsumer_del_stream(stream);
 		break;
 	default:
@@ -2251,14 +2260,21 @@ restart:
 				DBG("Metadata available on fd %d", pollfd);
 				assert(stream->wait_fd == pollfd);
 
-				len = ctx->on_buffer_ready(stream, ctx);
+				do {
+					len = ctx->on_buffer_ready(stream, ctx);
+					/*
+					 * We don't check the return value here since if we get
+					 * a negative len, it means an error occured thus we
+					 * simply remove it from the poll set and free the
+					 * stream.
+					 */
+				} while (len > 0);
+
 				/* It's ok to have an unavailable sub-buffer */
 				if (len < 0 && len != -EAGAIN && len != -ENODATA) {
 					/* Clean up stream from consumer and free it. */
 					lttng_poll_del(&events, stream->wait_fd);
 					consumer_del_metadata_stream(stream, metadata_ht);
-				} else if (len > 0) {
-					stream->data_read = 1;
 				}
 			}