X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=4ba40a075fdae27516c53406f6cc1a1e9938f45d;hb=670a26e4165562ab2dc5a16b9941f942e4f30996;hp=4bd9d80abc5655283435fa34473ddbb0215eda5b;hpb=26c468bba13ead8ab3fd8b28c7371a399fae0f31;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 4bd9d80ab..4ba40a075 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -370,10 +370,10 @@ struct consumer_socket *consumer_find_socket_by_bitness(int bits,
 
 	switch (bits) {
 	case 64:
-		consumer_fd = uatomic_read(&ust_consumerd64_fd);
+		consumer_fd = uatomic_read(&the_ust_consumerd64_fd);
 		break;
 	case 32:
-		consumer_fd = uatomic_read(&ust_consumerd32_fd);
+		consumer_fd = uatomic_read(&the_ust_consumerd32_fd);
 		break;
 	default:
 		assert(0);
@@ -951,8 +951,10 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 		LTTNG_OPTIONAL_SET(&msg->u.ask_channel.chunk_id, chunk_id);
 	}
-	msg->u.ask_channel.buffer_credentials.uid = buffer_credentials->uid;
-	msg->u.ask_channel.buffer_credentials.gid = buffer_credentials->gid;
+	msg->u.ask_channel.buffer_credentials.uid =
+			lttng_credentials_get_uid(buffer_credentials);
+	msg->u.ask_channel.buffer_credentials.gid =
+			lttng_credentials_get_gid(buffer_credentials);
 
 	msg->cmd_type = LTTNG_CONSUMER_ASK_CHANNEL_CREATION;
 	msg->u.ask_channel.subbuf_size = subbuf_size;
@@ -1151,12 +1153,10 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		char output_path[LTTNG_PATH_MAX] = {};
 		uint64_t relayd_session_id;
 
-		ret = relayd_create_session(rsock,
-				&relayd_session_id,
+		ret = relayd_create_session(rsock, &relayd_session_id,
 				session_name, hostname, base_path,
-				session_live_timer,
-				consumer->snapshot, session_id,
-				sessiond_uuid, current_chunk_id,
+				session_live_timer, consumer->snapshot,
+				session_id, the_sessiond_uuid, current_chunk_id,
 				session_creation_time,
 				session_name_contains_creation_time,
 				output_path);
@@ -1930,9 +1930,9 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
 		assert(domain_dirfd >= 0);
 
 		msg.u.create_trace_chunk.credentials.value.uid =
-				chunk_credentials.uid;
+				lttng_credentials_get_uid(&chunk_credentials);
 		msg.u.create_trace_chunk.credentials.value.gid =
-				chunk_credentials.gid;
+				lttng_credentials_get_gid(&chunk_credentials);
 		msg.u.create_trace_chunk.credentials.is_set = 1;
 	}