X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=e0d6ea496ade52af826cf02b0fc9fe0054b64895;hp=afc346333c5dc780a57c2bb86a548a9b0c60d82f;hb=3a84e2f3c3df5b461d9621b64f14abc3b8c3c29c;hpb=0b50e4b3fb9859af7072adcca784684834e5f8d1

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index afc346333..e0d6ea496 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -323,6 +323,7 @@ static void free_relayd_rcu(struct rcu_head *head)
 	(void) relayd_close(&relayd->control_sock);
 	(void) relayd_close(&relayd->data_sock);
 
+	pthread_mutex_destroy(&relayd->ctrl_sock_mutex);
 	free(relayd);
 }
 
@@ -2340,7 +2341,6 @@ int consumer_post_rotation(struct lttng_consumer_stream *stream,
 				stream->chan->name);
 		ret = rotate_notify_sessiond(ctx, stream->chan->key);
 	}
-	assert(stream->chan->nr_stream_rotate_pending >= 0);
 	pthread_mutex_unlock(&stream->chan->lock);
 
 	return ret;
@@ -2577,7 +2577,9 @@ void *consumer_thread_data_poll(void *data)
 	/* local view of the streams */
 	struct lttng_consumer_stream **local_stream = NULL, *new_stream = NULL;
 	/* local view of consumer_data.fds_count */
-	int nb_fd = 0, nb_pipes_fd;
+	int nb_fd = 0;
+	/* 2 for the consumer_data_pipe and wake up pipe */
+	const int nb_pipes_fd = 2;
 	/* Number of FDs with CONSUMER_ENDPOINT_INACTIVE but still open. */
 	int nb_inactive_fd = 0;
 	struct lttng_consumer_local_data *ctx = data;
@@ -2617,12 +2619,7 @@ void *consumer_thread_data_poll(void *data)
 			free(local_stream);
 			local_stream = NULL;
 
-			/*
-			 * Allocate for all fds + 2:
-			 *   +1 for the consumer_data_pipe
-			 *   +1 for wake up pipe
-			 */
-			nb_pipes_fd = 2;
+			/* Allocate for all fds */
 			pollfd = zmalloc((consumer_data.stream_count + nb_pipes_fd) * sizeof(struct pollfd));
 			if (pollfd == NULL) {
 				PERROR("pollfd malloc");