X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=b2feb3945c8a40f3c1476e4dba7d9b659b8f9f8b;hp=3415cfe92872b01d2df95a564dca380db3cc16ce;hb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;hpb=081424af9c3314d41eda58592d9fd6a66d94e852

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 3415cfe92..b2feb3945 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -67,6 +67,8 @@ struct consumer_channel_msg {
 	uint64_t key;				/* del */
 };
 
+int data_consumption_paused;
+
 /*
  * Flag to inform the polling thread to quit when all fd hung up. Updated by
  * the consumer_thread_receive_fds when it notices that all fds has hung up.
@@ -368,6 +370,9 @@ void consumer_del_channel(struct lttng_consumer_channel *channel)
 	if (channel->live_timer_enabled == 1) {
 		consumer_timer_live_stop(channel);
 	}
+	if (channel->monitor_timer_enabled == 1) {
+		consumer_timer_monitor_stop(channel);
+	}
 
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
@@ -1348,6 +1353,8 @@ struct lttng_consumer_local_data *lttng_consumer_create(
 		goto error_metadata_pipe;
 	}
 
+	ctx->channel_monitor_pipe = -1;
+
 	return ctx;
 
 error_metadata_pipe:
@@ -2051,12 +2058,12 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	DBG3("Consumer delete metadata stream %d", stream->wait_fd);
 
 	pthread_mutex_lock(&consumer_data.lock);
+	pthread_mutex_lock(&stream->chan->lock);
+	pthread_mutex_lock(&stream->lock);
 	if (stream->chan->metadata_cache) {
 		/* Only applicable to userspace consumers. */
 		pthread_mutex_lock(&stream->chan->metadata_cache->lock);
 	}
-	pthread_mutex_lock(&stream->chan->lock);
-	pthread_mutex_lock(&stream->lock);
 
 	/* Remove any reference to that stream. */
 	consumer_stream_delete(stream, ht);
@@ -2080,11 +2087,11 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	 */
 	stream->chan->metadata_stream = NULL;
 
-	pthread_mutex_unlock(&stream->lock);
-	pthread_mutex_unlock(&stream->chan->lock);
 	if (stream->chan->metadata_cache) {
 		pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
 	}
+	pthread_mutex_unlock(&stream->lock);
+	pthread_mutex_unlock(&stream->chan->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
 
 	if (free_chan) {
@@ -2525,6 +2532,9 @@ void *consumer_thread_data_poll(void *data)
 		/* poll on the array of fds */
 	restart:
 		DBG("polling on %d fd", nb_fd + 2);
+		if (testpoint(consumerd_thread_data_poll)) {
+			goto end;
+		}
 		health_poll_entry();
 		num_rdy = poll(pollfd, nb_fd + 2, -1);
 		health_poll_exit();