X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.cpp;h=c24ea6bca60762dcab04d8ddc147c7608276c60e;hb=5c5e3d718d8248d5e075f64c34667c4c4617ae63;hp=f9807cb0173f4bf6f4a7c0e9f838afb4631c16ec;hpb=6653fca60fdb6bf4ea4781bfee8304832d6a7e83;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-stream.cpp b/src/common/consumer/consumer-stream.cpp
index f9807cb01..c24ea6bca 100644
--- a/src/common/consumer/consumer-stream.cpp
+++ b/src/common/consumer/consumer-stream.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  *
@@ -669,6 +669,7 @@ struct lttng_consumer_stream *consumer_stream_create(
 		goto error;
 	}
 
+	stream->send_node = CDS_LIST_HEAD_INIT(stream->send_node);
 	stream->chan = channel;
 	stream->key = stream_key;
 	stream->trace_chunk = trace_chunk;
@@ -1060,6 +1061,8 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream,
 {
 	LTTNG_ASSERT(stream);
 
+	cds_list_del_init(&stream->send_node);
+
 	/* Stream is in monitor mode. */
 	if (stream->monitor) {
 		struct lttng_consumer_channel *free_chan = NULL;
@@ -1092,6 +1095,7 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream,
 			 * If the stream is not visible globally, this needs to be done
 			 * outside of the consumer data lock section.
 			 */
+			destroy_close_stream(stream);
 			free_chan = unref_channel(stream);
 		}