X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=431bb98f6cd25ce1da5315ffd177b37960525d04;hb=a00932c89ecca1b8ff133df17cc6737322247f4b;hp=42a097b955e96e73a330f38b634099d34c1f0c62;hpb=4222116f0098672bbbc0fea2b994e50007929d58;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index 42a097b95..431bb98f6 100644
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -25,22 +25,22 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <bin/lttng-consumerd/health-consumerd.h>
-#include <common/common.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/relayd/relayd.h>
-#include <common/compat/fcntl.h>
-#include <common/compat/endian.h>
-#include <common/consumer/consumer-metadata-cache.h>
-#include <common/consumer/consumer-stream.h>
-#include <common/consumer/consumer-timer.h>
-#include <common/utils.h>
-#include <common/index/index.h>
-#include <common/consumer/consumer.h>
-#include <common/shm.h>
-#include <common/optional.h>
-
-#include "ust-consumer.h"
+#include <bin/lttng-consumerd/health-consumerd.hpp>
+#include <common/common.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/relayd/relayd.hpp>
+#include <common/compat/fcntl.hpp>
+#include <common/compat/endian.hpp>
+#include <common/consumer/consumer-metadata-cache.hpp>
+#include <common/consumer/consumer-stream.hpp>
+#include <common/consumer/consumer-timer.hpp>
+#include <common/utils.hpp>
+#include <common/index/index.hpp>
+#include <common/consumer/consumer.hpp>
+#include <common/shm.hpp>
+#include <common/optional.hpp>
+
+#include "ust-consumer.hpp"
 
 #define INT_MAX_STR_LEN 12	/* includes \0 */
 
@@ -49,46 +49,6 @@ extern int consumer_poll_timeout;
 
 LTTNG_EXPORT DEFINE_LTTNG_UST_SIGBUS_STATE();
 
-/*
- * Free channel object and all streams associated with it. This MUST be used
- * only and only if the channel has _NEVER_ been added to the global channel
- * hash table.
- */
-static void destroy_channel(struct lttng_consumer_channel *channel)
-{
-	struct lttng_consumer_stream *stream, *stmp;
-
-	LTTNG_ASSERT(channel);
-
-	DBG("UST consumer cleaning stream list");
-
-	cds_list_for_each_entry_safe(stream, stmp, &channel->streams.head,
-			send_node) {
-
-		health_code_update();
-
-		cds_list_del(&stream->send_node);
-		lttng_ust_ctl_destroy_stream(stream->ustream);
-		lttng_trace_chunk_put(stream->trace_chunk);
-		free(stream);
-	}
-
-	/*
-	 * If a channel is available meaning that was created before the streams
-	 * were, delete it.
-	 */
-	if (channel->uchan) {
-		lttng_ustconsumer_del_channel(channel);
-		lttng_ustconsumer_free_channel(channel);
-	}
-
-	if (channel->trace_chunk) {
-		lttng_trace_chunk_put(channel->trace_chunk);
-	}
-
-	free(channel);
-}
-
 /*
  * Add channel to internal consumer state.
  *
@@ -203,7 +163,7 @@ static int send_stream_to_thread(struct lttng_consumer_stream *stream,
 	 * global.
 	 */
 	stream->globally_visible = 1;
-	cds_list_del(&stream->send_node);
+	cds_list_del_init(&stream->send_node);
 
 	ret = lttng_pipe_write(stream_pipe, &stream, sizeof(stream));
 	if (ret < 0) {
@@ -407,7 +367,7 @@ static int create_ust_channel(struct lttng_consumer_channel *channel,
 		nr_stream_fds = 1;
 	else
 		nr_stream_fds = lttng_ust_ctl_get_nr_stream_per_channel();
-	stream_fds = (int *) zmalloc(nr_stream_fds * sizeof(*stream_fds));
+	stream_fds = calloc<int>(nr_stream_fds);
 	if (!stream_fds) {
 		ret = -1;
 		goto error_alloc;
@@ -950,7 +910,6 @@ error:
 	 * will make sure to clean that list.
 	 */
 	consumer_stream_destroy(metadata->metadata_stream, NULL);
-	cds_list_del(&metadata->metadata_stream->send_node);
 	metadata->metadata_stream = NULL;
 send_streams_error:
 error_no_stream:
@@ -1034,7 +993,6 @@ error_stream:
 	 * new metadata stream.
 	 */
 	consumer_stream_destroy(metadata_stream, NULL);
-	cds_list_del(&metadata_stream->send_node);
 	metadata_channel->metadata_stream = NULL;
 
 error:
@@ -1288,7 +1246,7 @@ int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
 
 	DBG("UST consumer push metadata key %" PRIu64 " of len %" PRIu64, key, len);
 
-	metadata_str = (char *) zmalloc(len * sizeof(char));
+	metadata_str = calloc<char>(len);
 	if (!metadata_str) {
 		PERROR("zmalloc metadata string");
 		ret_code = LTTCOMM_CONSUMERD_ENOMEM;
@@ -2067,8 +2025,7 @@ error_push_metadata_fatal:
 			 */
 			rotate_channel = lttng_consumer_rotate_channel(
 					found_channel, key,
-					msg.u.rotate_channel.relayd_id,
-					msg.u.rotate_channel.metadata, ctx);
+					msg.u.rotate_channel.relayd_id);
 			if (rotate_channel < 0) {
 				ERR("Rotate channel failed");
 				ret_code = LTTCOMM_CONSUMERD_ROTATION_FAIL;
@@ -2095,8 +2052,7 @@ error_push_metadata_fatal:
 
 			ret_rotate_read_streams =
 					lttng_consumer_rotate_ready_streams(
-							found_channel, key,
-							ctx);
+							found_channel, key);
 			if (ret_rotate_read_streams < 0) {
 				ERR("Rotate channel failed");
 			}
@@ -2319,11 +2275,7 @@ end_msg_sessiond:
 
 end_channel_error:
 	if (channel) {
-		/*
-		 * Free channel here since no one has a reference to it. We don't
-		 * free after that because a stream can store this pointer.
-		 */
-		destroy_channel(channel);
+		consumer_del_channel(channel);
 	}
 	/* We have to send a status channel message indicating an error. */
 	{
@@ -3071,7 +3023,7 @@ end:
 }
 
 static int put_next_subbuffer(struct lttng_consumer_stream *stream,
-		struct stream_subbuffer *subbuffer)
+		struct stream_subbuffer *subbuffer __attribute__((unused)))
 {
 	const int ret = lttng_ust_ctl_put_next_subbuf(stream->ustream);
 
@@ -3080,7 +3032,7 @@ static int put_next_subbuffer(struct lttng_consumer_stream *stream,
 }
 
 static int signal_metadata(struct lttng_consumer_stream *stream,
-		struct lttng_consumer_local_data *ctx)
+		struct lttng_consumer_local_data *ctx __attribute__((unused)))
 {
 	ASSERT_LOCKED(stream->metadata_rdv_lock);
 	return pthread_cond_broadcast(&stream->metadata_rdv) ? -errno : 0;