X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.h;h=e385032cb71f98d4994dfad241e915f61e0cb28a;hb=62c43103c60bd704cd8ed7acaaa22465802f5673;hp=542e05c0fb9e36b8fca3ec6b0995d8d20edb1b18;hpb=77f7bd852edcc4f7227792553229c59fd590a447;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/stream.h b/src/bin/lttng-relayd/stream.h
index 542e05c0f..e385032cb 100644
--- a/src/bin/lttng-relayd/stream.h
+++ b/src/bin/lttng-relayd/stream.h
@@ -37,12 +37,6 @@
 struct relay_stream {
 	uint64_t stream_handle;
 
-	/*
-	 * reflock used to synchronize the closing of this stream.
-	 * stream reflock nests inside viewer stream reflock.
-	 * stream reflock nests inside index reflock.
-	 */
-	pthread_mutex_t reflock;
 	struct urcu_ref ref;
 	/* Back reference to trace. Protected by refcount on trace object. */
 	struct ctf_trace *trace;
@@ -58,8 +52,8 @@ struct relay_stream {
 
 	/* FD on which to write the stream data. */
 	struct stream_fd *stream_fd;
-	/* FD on which to write the index data. */
-	struct stream_fd *index_fd;
+	/* index file on which to write the index data. */
+	struct lttng_index_file *index_file;
 
 	char *path_name;
 	char *channel_name;
@@ -85,7 +79,8 @@ struct relay_stream {
 	 */
 	struct tracefile_array *tfa;
 
-	bool closed;	/* Stream is closed. */
+	bool closed;		/* Stream is closed. */
+	bool close_requested;	/* Close command has been received. */
 
 	/*
 	 * Counts number of indexes in indexes_ht. Redundant info.
@@ -144,7 +139,7 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 struct relay_stream *stream_get_by_id(uint64_t stream_id);
 bool stream_get(struct relay_stream *stream);
 void stream_put(struct relay_stream *stream);
-void stream_close(struct relay_stream *stream);
+void try_stream_close(struct relay_stream *stream);
 void stream_publish(struct relay_stream *stream);
 void print_relay_streams(void);