X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.cpp;h=bb0ec0a2436db1a9fb042b29b1e53b622c2eb60e;hb=319dcddc7409961e156af76666fe70d31baec55a;hp=f57e37ab81379027daf318acc58d2b90b710b41d;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-stream.cpp b/src/common/consumer/consumer-stream.cpp
index f57e37ab8..bb0ec0a24 100644
--- a/src/common/consumer/consumer-stream.cpp
+++ b/src/common/consumer/consumer-stream.cpp
@@ -35,9 +35,9 @@
 static void free_stream_rcu(struct rcu_head *head)
 {
 	struct lttng_ht_node_u64 *node =
-		caa_container_of(head, struct lttng_ht_node_u64, head);
+		lttng::utils::container_of(head, &lttng_ht_node_u64::head);
 	struct lttng_consumer_stream *stream =
-		caa_container_of(node, struct lttng_consumer_stream, node);
+		lttng::utils::container_of(node, &lttng_consumer_stream::node);
 
 	pthread_mutex_destroy(&stream->lock);
 	free(stream);
@@ -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;
@@ -1075,10 +1075,12 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream,
 		if (stream->globally_visible) {
 			pthread_mutex_lock(&the_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);
 
+
 			destroy_close_stream(stream);
 
 			/* Update channel's refcount of the stream. */