X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.cpp;h=ed844f8dfd8a4d27826ea6b8644d04fc244b0014;hb=fbd566c25787aa7134e84efcfb7d3569f27d3350;hp=4823d9b9c59aa6f9933d9e7552fe27fb48865cb6;hpb=f40b76aed659ff694cf948bf8ebd1d4b5741c986;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.cpp b/src/common/consumer/consumer.cpp
index 4823d9b9c..ed844f8df 100644
--- a/src/common/consumer/consumer.cpp
+++ b/src/common/consumer/consumer.cpp
@@ -45,6 +45,7 @@
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <type_traits>
 #include <unistd.h>
 
 lttng_consumer_global_data the_consumer_data;
@@ -303,7 +304,8 @@ static void free_channel_rcu(struct rcu_head *head)
 		ERR("Unknown consumer_data type");
 		abort();
 	}
-	free(channel);
+
+	delete channel;
 }
 
 /*
@@ -462,7 +464,7 @@ static void update_endpoint_status_by_netidx(uint64_t net_seq_idx,
 	cds_lfht_for_each_entry (metadata_ht->ht, &iter.iter, stream, node.node) {
 		if (stream->net_seq_idx == net_seq_idx) {
 			uatomic_set(&stream->endpoint_status, status);
-			lttng_wait_queue_wake_all(&stream->chan->metadata_pushed_wait_queue);
+			stream->chan->metadata_pushed_wait_queue.wake_all();
 
 			DBG("Delete flag set to metadata stream %d", stream->wait_fd);
 		}
@@ -1019,9 +1021,11 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		}
 	}
 
-	channel = zmalloc<lttng_consumer_channel>();
-	if (channel == nullptr) {
-		PERROR("malloc struct lttng_consumer_channel");
+	try {
+		channel = new lttng_consumer_channel;
+	} catch (const std::bad_alloc& e) {
+		ERR("Failed to allocate lttng_consumer_channel: %s", e.what());
+		channel = nullptr;
 		goto end;
 	}
 
@@ -1037,7 +1041,6 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 	channel->is_live = is_in_live_session;
 	pthread_mutex_init(&channel->lock, NULL);
 	pthread_mutex_init(&channel->timer_lock, NULL);
-	lttng_wait_queue_init(&channel->metadata_pushed_wait_queue);
 
 	switch (output) {
 	case LTTNG_EVENT_SPLICE:
@@ -1048,7 +1051,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		break;
 	default:
 		abort();
-		free(channel);
+		delete channel;
 		channel = nullptr;
 		goto end;
 	}
@@ -1253,11 +1256,17 @@ void lttng_consumer_set_command_sock_path(struct lttng_consumer_local_data *ctx,
  * Send return code to the session daemon.
  * If the socket is not defined, we return 0, it is not a fatal error
  */
-int lttng_consumer_send_error(struct lttng_consumer_local_data *ctx, int cmd)
+int lttng_consumer_send_error(struct lttng_consumer_local_data *ctx,
+			      enum lttcomm_return_code error_code)
 {
 	if (ctx->consumer_error_socket > 0) {
+		const std::int32_t comm_code = std::int32_t(error_code);
+
+		static_assert(
+			sizeof(comm_code) >= sizeof(std::underlying_type<lttcomm_return_code>),
+			"Fixed-size communication type too small to accomodate lttcomm_return_code");
 		return lttcomm_send_unix_sock(
-			ctx->consumer_error_socket, &cmd, sizeof(enum lttcomm_sessiond_command));
+			ctx->consumer_error_socket, &comm_code, sizeof(comm_code));
 	}
 
 	return 0;
@@ -2133,7 +2142,7 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream, struct l
 	 * pointer value.
 	 */
 	channel->metadata_stream = nullptr;
-	lttng_wait_queue_wake_all(&channel->metadata_pushed_wait_queue);
+	channel->metadata_pushed_wait_queue.wake_all();
 
 	if (channel->metadata_cache) {
 		pthread_mutex_unlock(&channel->metadata_cache->lock);