X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=feec3562d64fcf46df09e834870377637fda75dc;hp=5ca2e7bad68187f7b61b628a28ae0932658a3ccb;hb=f623cc0b347c449f302ac674937b1c0c647495ce;hpb=e43c41c57a0087c782ca0ec29d6613364605d31d

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 5ca2e7bad..feec3562d 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -102,6 +102,7 @@ static void notify_channel_pipe(struct lttng_consumer_local_data *ctx,
 
 	msg.action = action;
 	msg.chan = chan;
+	msg.key = key;
 	do {
 		ret = write(ctx->consumer_channel_pipe[1], &msg, sizeof(msg));
 	} while (ret < 0 && errno == EINTR);
@@ -1959,6 +1960,13 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	}
 
 end:
+	/*
+	 * Nullify the stream reference so it is not used after deletion. The
+	 * consumer data lock MUST be acquired before being able to check for a
+	 * NULL pointer value.
+	 */
+	stream->chan->metadata_stream = NULL;
+
 	pthread_mutex_unlock(&stream->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
 
@@ -2011,9 +2019,6 @@ static int add_metadata_stream(struct lttng_consumer_stream *stream,
 		uatomic_inc(&relayd->refcount);
 	}
 
-	/* Update channel refcount once added without error(s). */
-	uatomic_inc(&stream->chan->refcount);
-
 	/*
 	 * When nb_init_stream_left reaches 0, we don't need to trigger any action
 	 * in terms of destroying the associated channel, because the action that
@@ -2711,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);
@@ -2736,6 +2746,7 @@ restart:
 						if (!uatomic_sub_return(&chan->refcount, 1)) {
 							consumer_del_channel(chan);
 						}
+						rcu_read_unlock();
 						goto restart;
 					}
 					case CONSUMER_CHANNEL_QUIT:
@@ -2968,7 +2979,7 @@ end:
 		}
 	}
 	if (client_socket >= 0) {
-		ret = close(sock);
+		ret = close(client_socket);
 		if (ret < 0) {
 			PERROR("close client_socket sessiond poll");
 		}