X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.h;h=8c679da9c975c858e2bd863a73e9ccc9aae9480f;hb=1e791a74976525f287944e5dbb65208a3b9edf42;hp=426cd0317ab46785c06ae44c5ed99c8438b0cc9e;hpb=f39bd140151b845f44abd6a7079eaaf5cfed1c89;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index 426cd0317..8c679da9c 100644
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -30,6 +30,7 @@
 #include <common/hashtable/hashtable.h>
 #include <common/compat/uuid.h>
 #include <common/trace-chunk.h>
+#include <common/optional.h>
 
 /*
  * Represents a session for the relay point of view
@@ -41,6 +42,15 @@ struct relay_session {
 	 * It is used to match a set of streams to their session.
 	 */
 	uint64_t id;
+	/*
+	 * ID of the session in the session daemon's domain.
+	 * This information is only provided by 2.11+ peers.
+	 */
+	LTTNG_OPTIONAL(uint64_t) id_sessiond;
+	/*
+	 * Only provided by 2.11+ peers. However, the UUID is set to 'nil' in
+	 * the other cases.
+	 */
 	lttng_uuid sessiond_uuid;
 	char session_name[LTTNG_NAME_MAX];
 	char hostname[LTTNG_HOST_NAME_MAX];
@@ -115,6 +125,7 @@ struct relay_session {
 struct relay_session *session_create(const char *session_name,
 		const char *hostname, uint32_t live_timer,
 		bool snapshot, const lttng_uuid sessiond_uuid,
+		uint64_t *id_sessiond, uint64_t *current_chunk_id,
 		uint32_t major, uint32_t minor);
 struct relay_session *session_get_by_id(uint64_t id);
 bool session_get(struct relay_session *session);