X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=6990dd9678ad2723738e3cf5dd18fe2dd53b069f;hb=0c7bcad5eaa11b368460759fc87f949e8c56b98f;hp=6fd716bdb4cd34ff881659702ab88518097175b7;hpb=c7260a81b6c99282da7c59b6124381f92c637658;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 6fd716bdb..6990dd967 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2349,7 +2349,7 @@ void *consumer_thread_data_poll(void *data)
 
 			/* allocate for all fds + 1 for the consumer_data_pipe */
 			local_stream = zmalloc((consumer_data.stream_count + 1) *
-					sizeof(struct lttng_consumer_stream));
+					sizeof(struct lttng_consumer_stream *));
 			if (local_stream == NULL) {
 				PERROR("local_stream malloc");
 				pthread_mutex_unlock(&consumer_data.lock);
@@ -2734,6 +2734,7 @@ restart:
 							break;
 						}
 						lttng_poll_del(&events, chan->wait_fd);
+						iter.iter.node = &chan->wait_fd_node.node;
 						ret = lttng_ht_del(channel_ht, &iter);
 						assert(ret == 0);
 						consumer_close_channel_streams(chan);
@@ -2872,12 +2873,6 @@ void *consumer_thread_sessiond_poll(void *data)
 		goto end;
 	}
 
-	ret = fcntl(client_socket, F_SETFL, O_NONBLOCK);
-	if (ret < 0) {
-		PERROR("fcntl O_NONBLOCK");
-		goto end;
-	}
-
 	/* prepare the FDs to poll : to client socket and the should_quit pipe */
 	consumer_sockpoll[0].fd = ctx->consumer_should_quit[0];
 	consumer_sockpoll[0].events = POLLIN | POLLPRI;
@@ -2895,11 +2890,6 @@ void *consumer_thread_sessiond_poll(void *data)
 		WARN("On accept");
 		goto end;
 	}
-	ret = fcntl(sock, F_SETFL, O_NONBLOCK);
-	if (ret < 0) {
-		PERROR("fcntl O_NONBLOCK");
-		goto end;
-	}
 
 	/*
 	 * Setup metadata socket which is the second socket connection on the