X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=0cfbf5c7c03ef36bf1dc958601babd76e6f3d279;hb=8bdcc002595070b62b2ea7a58fa7f9b090cf6d2d;hp=46b961e8980d8f30e68062a73dd2979c6ca6bf92;hpb=ec135c61effc83fff0695e0e36a4182a8be83c5c;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 46b961e89..0cfbf5c7c 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -2576,7 +2576,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;
@@ -2616,12 +2618,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");