X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.cpp;h=c22c7e5f3390f74576bb22fa0bfe10e506ed9a51;hb=f149493493fbd8a3efa4748832c03278c96c38ca;hp=2dc3f002b937fe0061caeeacf204d9f7a2b57862;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-stream.cpp b/src/common/consumer/consumer-stream.cpp
index 2dc3f002b..c22c7e5f3 100644
--- a/src/common/consumer/consumer-stream.cpp
+++ b/src/common/consumer/consumer-stream.cpp
@@ -12,22 +12,22 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <common/common.h>
-#include <common/consumer/consumer-timer.h>
-#include <common/consumer/consumer-timer.h>
-#include <common/consumer/consumer.h>
-#include <common/consumer/consumer.h>
-#include <common/consumer/metadata-bucket.h>
-#include <common/consumer/metadata-bucket.h>
-#include <common/index/index.h>
-#include <common/kernel-consumer/kernel-consumer.h>
-#include <common/kernel-ctl/kernel-ctl.h>
-#include <common/macros.h>
-#include <common/relayd/relayd.h>
-#include <common/ust-consumer/ust-consumer.h>
-#include <common/utils.h>
-
-#include "consumer-stream.h"
+#include <common/common.hpp>
+#include <common/consumer/consumer-timer.hpp>
+#include <common/consumer/consumer-timer.hpp>
+#include <common/consumer/consumer.hpp>
+#include <common/consumer/consumer.hpp>
+#include <common/consumer/metadata-bucket.hpp>
+#include <common/consumer/metadata-bucket.hpp>
+#include <common/index/index.hpp>
+#include <common/kernel-consumer/kernel-consumer.hpp>
+#include <common/kernel-ctl/kernel-ctl.hpp>
+#include <common/macros.hpp>
+#include <common/relayd/relayd.hpp>
+#include <common/ust-consumer/ust-consumer.hpp>
+#include <common/utils.hpp>
+
+#include "consumer-stream.hpp"
 
 /*
  * RCU call to free stream. MUST only be used with call_rcu().
@@ -160,7 +160,7 @@ void ctf_packet_index_populate(struct ctf_packet_index *index,
 }
 
 static ssize_t consumer_stream_consume_mmap(
-		struct lttng_consumer_local_data *ctx,
+		struct lttng_consumer_local_data *ctx __attribute__((unused)),
 		struct lttng_consumer_stream *stream,
 		const struct stream_subbuffer *subbuffer)
 {
@@ -231,7 +231,7 @@ static ssize_t consumer_stream_consume_splice(
 static int consumer_stream_send_index(
 		struct lttng_consumer_stream *stream,
 		const struct stream_subbuffer *subbuffer,
-		struct lttng_consumer_local_data *ctx)
+		struct lttng_consumer_local_data *ctx __attribute__((unused)))
 {
 	off_t packet_offset = 0;
 	struct ctf_packet_index index = {};
@@ -591,8 +591,8 @@ end:
  */
 static
 int post_consume_open_new_packet(struct lttng_consumer_stream *stream,
-		const struct stream_subbuffer *subbuffer,
-		struct lttng_consumer_local_data *ctx)
+		const struct stream_subbuffer *subbuffer __attribute__((unused)),
+		struct lttng_consumer_local_data *ctx __attribute__((unused)))
 {
 	int ret = 0;
 
@@ -654,7 +654,7 @@ struct lttng_consumer_stream *consumer_stream_create(
 	int ret;
 	struct lttng_consumer_stream *stream;
 
-	stream = (lttng_consumer_stream *) zmalloc(sizeof(*stream));
+	stream = zmalloc<lttng_consumer_stream>();
 	if (stream == NULL) {
 		PERROR("malloc struct lttng_consumer_stream");
 		ret = -ENOMEM;
@@ -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);
 		}
 
@@ -1270,7 +1274,7 @@ end:
 }
 
 static ssize_t metadata_bucket_consume(
-		struct lttng_consumer_local_data *unused,
+		struct lttng_consumer_local_data *unused __attribute__((unused)),
 		struct lttng_consumer_stream *stream,
 		const struct stream_subbuffer *subbuffer)
 {