X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-stream.c;h=2bb5ce7e8adee8a235d9b5b6783b66fe5ecef7fd;hp=03bac86870031eb2b63661f178f5cee0601748c6;hb=309167d2a6f59d0c8cbf64eb23ba912cdea76a34;hpb=4891ece8d4eeb2645efdf1467680b037c63ab425

diff --git a/src/common/consumer-stream.c b/src/common/consumer-stream.c
index 03bac8687..2bb5ce7e8 100644
--- a/src/common/consumer-stream.c
+++ b/src/common/consumer-stream.c
@@ -58,8 +58,10 @@ void consumer_stream_relayd_close(struct lttng_consumer_stream *stream,
 	assert(stream);
 	assert(relayd);
 
-	uatomic_dec(&relayd->refcount);
-	assert(uatomic_read(&relayd->refcount) >= 0);
+	if (stream->sent_to_relayd) {
+		uatomic_dec(&relayd->refcount);
+		assert(uatomic_read(&relayd->refcount) >= 0);
+	}
 
 	/* Closing streams requires to lock the control socket. */
 	pthread_mutex_lock(&relayd->ctrl_sock_mutex);
@@ -82,6 +84,7 @@ void consumer_stream_relayd_close(struct lttng_consumer_stream *stream,
 		consumer_destroy_relayd(relayd);
 	}
 	stream->net_seq_idx = (uint64_t) -1ULL;
+	stream->sent_to_relayd = 0;
 }
 
 /*
@@ -132,6 +135,14 @@ void consumer_stream_close(struct lttng_consumer_stream *stream)
 		stream->out_fd = -1;
 	}
 
+	if (stream->index_fd >= 0) {
+		ret = close(stream->index_fd);
+		if (ret) {
+			PERROR("close stream index_fd");
+		}
+		stream->index_fd = -1;
+	}
+
 	/* Check and cleanup relayd if needed. */
 	rcu_read_lock();
 	relayd = consumer_find_relayd(stream->net_seq_idx);
@@ -277,6 +288,7 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream,
 		 */
 		if (stream->globally_visible) {
 			pthread_mutex_lock(&consumer_data.lock);
+			pthread_mutex_lock(&stream->chan->lock);
 			pthread_mutex_lock(&stream->lock);
 			/* Remove every reference of the stream in the consumer. */
 			consumer_stream_delete(stream, ht);
@@ -290,6 +302,7 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream,
 			consumer_data.need_update = 1;
 
 			pthread_mutex_unlock(&stream->lock);
+			pthread_mutex_unlock(&stream->chan->lock);
 			pthread_mutex_unlock(&consumer_data.lock);
 		} else {
 			/*