Change backing type of lttng_uuid to std::array

[lttng-tools.git] / src / bin / lttng-relayd / session.cpp

diff --git a/src/bin/lttng-relayd/session.cpp b/src/bin/lttng-relayd/session.cpp
index a8a1520694025f3843b6cfabe9aebddca8a9488a..a776587b333a66c2c499d558b0c28c162fc8ae96 100644 (file)
--- 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 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,
                const uint64_t *id_sessiond,
                const uint64_t *current_chunk_id,
                const time_t *creation_time,


@@ -363,7 +363,7 @@ struct relay_session *session_create(const char *session_name,
 
        session->live_timer = live_timer;
        session->snapshot = snapshot;
 
        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);
 
        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;
                }
 
                        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;
                }
                        /* Sessions do not originate from the same sessiond. */
                        goto next_session;
                }