X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=6990dd9678ad2723738e3cf5dd18fe2dd53b069f;hb=747f8642070cc390b8f99a6385062ac0cb6716c4;hp=3709092198e5a9d1fcf6781134ba7e645ce3e202;hpb=a0c83db984f8c20897666eef226b43fce81d0e13;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 370909219..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);
@@ -2716,20 +2716,25 @@ restart:
 
 						lttng_ht_node_init_u64(&chan->wait_fd_node,
 							chan->wait_fd);
+						rcu_read_lock();
 						lttng_ht_add_unique_u64(channel_ht,
 								&chan->wait_fd_node);
+						rcu_read_unlock();
 						/* Add channel to the global poll events list */
 						lttng_poll_add(&events, chan->wait_fd,
 								LPOLLIN | LPOLLPRI);
 						break;
 					case CONSUMER_CHANNEL_DEL:
 					{
+						rcu_read_lock();
 						chan = consumer_find_channel(key);
 						if (!chan) {
+							rcu_read_unlock();
 							ERR("UST consumer get channel key %" PRIu64 " not found for del channel", key);
 							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);
@@ -2741,6 +2746,7 @@ restart:
 						if (!uatomic_sub_return(&chan->refcount, 1)) {
 							consumer_del_channel(chan);
 						}
+						rcu_read_unlock();
 						goto restart;
 					}
 					case CONSUMER_CHANNEL_QUIT:
@@ -2867,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;
@@ -2890,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