X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=42a097b955e96e73a330f38b634099d34c1f0c62;hb=4222116f0098672bbbc0fea2b994e50007929d58;hp=591c58fc5674100908f5fbcd847fa68db874f4d2;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index 591c58fc5..42a097b95 100644
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -876,6 +876,8 @@ static int setup_metadata(struct lttng_consumer_local_data *ctx, uint64_t key)
 	int ret;
 	struct lttng_consumer_channel *metadata;
 
+	ASSERT_RCU_READ_LOCKED();
+
 	DBG("UST consumer setup metadata key %" PRIu64, key);
 
 	metadata = consumer_find_channel(key);
@@ -971,6 +973,7 @@ static int snapshot_metadata(struct lttng_consumer_channel *metadata_channel,
 
 	LTTNG_ASSERT(path);
 	LTTNG_ASSERT(ctx);
+	ASSERT_RCU_READ_LOCKED();
 
 	DBG("UST consumer snapshot metadata with key %" PRIu64 " at path %s",
 			key, path);
@@ -1086,6 +1089,7 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 
 	LTTNG_ASSERT(path);
 	LTTNG_ASSERT(ctx);
+	ASSERT_RCU_READ_LOCKED();
 
 	rcu_read_lock();
 
@@ -1427,11 +1431,18 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	switch (msg.cmd_type) {
 	case LTTNG_CONSUMER_ADD_RELAYD_SOCKET:
 	{
+		uint32_t major = msg.u.relayd_sock.major;
+		uint32_t minor = msg.u.relayd_sock.minor;
+		enum lttcomm_sock_proto protocol =
+				(enum lttcomm_sock_proto) msg.u.relayd_sock
+						.relayd_socket_protocol;
+
 		/* Session daemon status message are handled in the following call. */
 		consumer_add_relayd_socket(msg.u.relayd_sock.net_index,
-				msg.u.relayd_sock.type, ctx, sock, consumer_sockpoll,
-				&msg.u.relayd_sock.sock, msg.u.relayd_sock.session_id,
-				msg.u.relayd_sock.relayd_session_id);
+				msg.u.relayd_sock.type, ctx, sock,
+				consumer_sockpoll, msg.u.relayd_sock.session_id,
+				msg.u.relayd_sock.relayd_session_id, major,
+				minor, protocol);
 		goto end_nosignal;
 	}
 	case LTTNG_CONSUMER_DESTROY_RELAYD:
@@ -2649,6 +2660,7 @@ enum sync_metadata_status lttng_ustconsumer_sync_metadata(
 
 	LTTNG_ASSERT(ctx);
 	LTTNG_ASSERT(metadata_stream);
+	ASSERT_RCU_READ_LOCKED();
 
 	metadata_channel = metadata_stream->chan;
 	pthread_mutex_unlock(&metadata_stream->lock);