X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.cpp;h=a8a1520694025f3843b6cfabe9aebddca8a9488a;hb=aeeb48c6a7dd4bcc092b3105439489fc393f6425;hp=5fa39663a5a63fc80fbc024509278d88aea988f0;hpb=ac497a37018f3c253d2e50397294f58d33f7f24f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.cpp b/src/bin/lttng-relayd/session.cpp
index 5fa39663a..a8a152069 100644
--- a/src/bin/lttng-relayd/session.cpp
+++ b/src/bin/lttng-relayd/session.cpp
@@ -8,23 +8,23 @@
  */
 
 #define _LGPL_SOURCE
-#include <common/common.h>
-#include <common/compat/path.h>
-#include <common/fd-tracker/utils.h>
-#include <common/time.h>
-#include <common/utils.h>
-#include <common/uuid.h>
+#include <common/common.hpp>
+#include <common/compat/path.hpp>
+#include <common/fd-tracker/utils.hpp>
+#include <common/time.hpp>
+#include <common/utils.hpp>
+#include <common/uuid.hpp>
 #include <urcu/rculist.h>
 
 #include <sys/stat.h>
 
-#include "ctf-trace.h"
-#include "lttng-relayd.h"
-#include "session.h"
-#include "sessiond-trace-chunks.h"
-#include "stream.h"
-#include <common/defaults.h>
-#include "utils.h"
+#include "ctf-trace.hpp"
+#include "lttng-relayd.hpp"
+#include "session.hpp"
+#include "sessiond-trace-chunks.hpp"
+#include "stream.hpp"
+#include <common/defaults.hpp>
+#include "utils.hpp"
 
 /* Global session id used in the session creation. */
 static uint64_t last_relay_session_id;
@@ -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;
@@ -474,6 +474,91 @@ end:
 	return session;
 }
 
+/*
+ * Check if any of the relay sessions originating from the same
+ * session daemon session have the 'ongoing_rotation' state set.
+ *
+ * The caller must hold the lock of session.
+ */
+bool session_has_ongoing_rotation(const struct relay_session *session)
+{
+	bool ongoing_rotation = false;
+	struct lttng_ht_iter iter;
+	struct relay_session *iterated_session;
+
+	ASSERT_LOCKED(session->lock);
+
+	if (!session->id_sessiond.is_set) {
+		/*
+		 * The peer that created this session is too old to
+		 * support rotations; we can assume no rotations are ongoing.
+		 */
+		goto end;
+	}
+
+	if (session->ongoing_rotation) {
+		ongoing_rotation = true;
+		goto end;
+	}
+
+	rcu_read_lock();
+	/*
+	 * Sample the 'ongoing_rotation' status of all relay sessions that
+	 * originate from the same session daemon session.
+	 */
+	cds_lfht_for_each_entry(sessions_ht->ht, &iter.iter, iterated_session,
+			session_n.node) {
+		if (!session_get(iterated_session)) {
+			continue;
+		}
+
+		if (session == iterated_session) {
+			/* Skip this session. */
+			goto next_session_no_unlock;
+		}
+
+		pthread_mutex_lock(&iterated_session->lock);
+
+		if (!iterated_session->id_sessiond.is_set) {
+			/*
+			 * Session belongs to a peer that doesn't support
+			 * rotations.
+			 */
+			goto next_session;
+		}
+
+		if (!lttng_uuid_is_equal(session->sessiond_uuid,
+				iterated_session->sessiond_uuid)) {
+			/* Sessions do not originate from the same sessiond. */
+			goto next_session;
+		}
+
+		if (LTTNG_OPTIONAL_GET(session->id_sessiond) !=
+				LTTNG_OPTIONAL_GET(iterated_session->id_sessiond)) {
+			/*
+			 * Sessions do not originate from the same sessiond
+			 * session.
+			 */
+			goto next_session;
+		}
+
+		ongoing_rotation = iterated_session->ongoing_rotation;
+
+next_session:
+		pthread_mutex_unlock(&iterated_session->lock);
+next_session_no_unlock:
+		session_put(iterated_session);
+
+		if (ongoing_rotation) {
+			break;
+		}
+	}
+	rcu_read_unlock();
+
+end:
+	return ongoing_rotation;
+}
+
 static void rcu_destroy_session(struct rcu_head *rcu_head)
 {
 	struct relay_session *session =