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

diff --git a/src/common/consumer-stream.c b/src/common/consumer-stream.c
index 03bac8687..920948760 100644
--- a/src/common/consumer-stream.c
+++ b/src/common/consumer-stream.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include <common/common.h>
+#include <common/index/index.h>
 #include <common/relayd/relayd.h>
 #include <common/ust-consumer/ust-consumer.h>
 
@@ -58,8 +59,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 +85,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 +136,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 +289,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 +303,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 {
 			/*
@@ -309,3 +323,35 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream,
 	/* Free stream within a RCU call. */
 	consumer_stream_free(stream);
 }
+
+/*
+ * Write index of a specific stream either on the relayd or local disk.
+ *
+ * Return 0 on success or else a negative value.
+ */
+int consumer_stream_write_index(struct lttng_consumer_stream *stream,
+		struct lttng_packet_index *index)
+{
+	int ret;
+	struct consumer_relayd_sock_pair *relayd;
+
+	assert(stream);
+	assert(index);
+
+	rcu_read_lock();
+	relayd = consumer_find_relayd(stream->net_seq_idx);
+	if (relayd) {
+		ret = relayd_send_index(&relayd->control_sock, index,
+				stream->relayd_stream_id, stream->next_net_seq_num - 1);
+	} else {
+		ret = index_write(stream->index_fd, index,
+				sizeof(struct lttng_packet_index));
+	}
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	rcu_read_unlock();
+	return ret;
+}