X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.h;h=2a034daf34e8b448f37fa8f6e301ffe4cd90a119;hp=8c679da9c975c858e2bd863a73e9ccc9aae9480f;hb=ecd1a12fac39784bded85c0f06e47ace2dc98cde;hpb=1e791a74976525f287944e5dbb65208a3b9edf42

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index 8c679da9c..2a034daf3 100644
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -52,8 +52,17 @@ struct relay_session {
 	 * the other cases.
 	 */
 	lttng_uuid sessiond_uuid;
+	LTTNG_OPTIONAL(time_t) creation_time;
 	char session_name[LTTNG_NAME_MAX];
 	char hostname[LTTNG_HOST_NAME_MAX];
+	char base_path[LTTNG_PATH_MAX];
+	/*
+	 * Session output path relative to relayd's output path.
+	 * Will be empty when interacting with peers < 2.11 since their
+	 * streams' path are expressed relative to the relay daemon's
+	 * output path.
+	 */
+	char output_path[LTTNG_PATH_MAX];
 	uint32_t live_timer;
 
 	/* Session in snapshot mode. */
@@ -85,6 +94,10 @@ struct relay_session {
 	 */
 	bool aborted;
 
+	bool session_name_contains_creation_time;
+	/* Whether session has performed an explicit rotation. */
+	bool has_rotated;
+
 	/* Contains ctf_trace object of that session indexed by path name. */
 	struct lttng_ht *ctf_traces_ht;
 
@@ -119,14 +132,21 @@ struct relay_session {
 	 */
 	struct cds_list_head viewer_session_node;
 	struct lttng_trace_chunk *current_trace_chunk;
+	struct lttng_trace_chunk *pending_closure_trace_chunk;
 	struct rcu_head rcu_node;	/* For call_rcu teardown. */
 };
 
 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);
+		const char *hostname, const char *base_path,
+		uint32_t live_timer,
+		bool snapshot,
+		const lttng_uuid sessiond_uuid,
+		const uint64_t *id_sessiond,
+		const uint64_t *current_chunk_id,
+		const time_t *creation_time,
+		uint32_t major,
+		uint32_t minor,
+		bool session_name_contains_creation_timestamp);
 struct relay_session *session_get_by_id(uint64_t id);
 bool session_get(struct relay_session *session);
 void session_put(struct relay_session *session);