X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.h;h=aa2a58a98f677351f33f2c9f3523495bf61568da;hp=426cd0317ab46785c06ae44c5ed99c8438b0cc9e;hb=cbf53d23cecaca9c6ec71582663c4a8254a9f285;hpb=639ddf685b134bb075b92819f647f9f3c462df54

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index 426cd0317..aa2a58a98 100644
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -28,8 +28,9 @@
 
 #include <lttng/constant.h>
 #include <common/hashtable/hashtable.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 #include <common/trace-chunk.h>
+#include <common/optional.h>
 
 /*
  * Represents a session for the relay point of view
@@ -41,9 +42,28 @@ 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;
+	LTTNG_OPTIONAL(time_t) creation_time;
+	/* Must _not_ be empty for 2.4+ peers. */
 	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. */
@@ -75,6 +95,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;
 
@@ -109,13 +133,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,
-		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);
@@ -123,6 +155,9 @@ void session_put(struct relay_session *session);
 int session_close(struct relay_session *session);
 int session_abort(struct relay_session *session);
 
+struct lttng_directory_handle *session_create_output_directory_handle(
+		struct relay_session *session);
+
 void print_sessions(void);
 
 #endif /* _SESSION_H */