X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.cpp;h=a776587b333a66c2c499d558b0c28c162fc8ae96;hb=3691d312bcf4dc2cc15f0ecb1f0e2fd2f34315b8;hp=abefc0d276ef355fefa11cc60d60de554e27b3da;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.cpp b/src/bin/lttng-relayd/session.cpp
index abefc0d27..a776587b3 100644
--- a/src/bin/lttng-relayd/session.cpp
+++ b/src/bin/lttng-relayd/session.cpp
@@ -281,7 +281,7 @@ struct relay_session *session_create(const char *session_name,
 		const char *hostname, const char *base_path,
 		uint32_t live_timer,
 		bool snapshot,
-		const lttng_uuid sessiond_uuid,
+		const lttng_uuid& sessiond_uuid,
 		const uint64_t *id_sessiond,
 		const uint64_t *current_chunk_id,
 		const time_t *creation_time,
@@ -310,7 +310,7 @@ struct relay_session *session_create(const char *session_name,
 		goto error;
 	}
 
-	session = (relay_session *) zmalloc(sizeof(*session));
+	session = zmalloc<relay_session>();
 	if (!session) {
 		PERROR("Failed to allocate session");
 		goto error;
@@ -363,7 +363,7 @@ struct relay_session *session_create(const char *session_name,
 
 	session->live_timer = live_timer;
 	session->snapshot = snapshot;
-	lttng_uuid_copy(session->sessiond_uuid, sessiond_uuid);
+	session->sessiond_uuid = sessiond_uuid;
 
 	if (id_sessiond) {
 		LTTNG_OPTIONAL_SET(&session->id_sessiond, *id_sessiond);
@@ -527,8 +527,7 @@ bool session_has_ongoing_rotation(const struct relay_session *session)
 			goto next_session;
 		}
 
-		if (!lttng_uuid_is_equal(session->sessiond_uuid,
-				iterated_session->sessiond_uuid)) {
+		if (session->sessiond_uuid != iterated_session->sessiond_uuid) {
 			/* Sessions do not originate from the same sessiond. */
 			goto next_session;
 		}