X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-relayd%2Fsession.h;h=43f76a4aad54eadc7ac3e53f311bab00a748653b;hb=a7ceb342d473cc37e00d74c45b04b5378965e055;hp=288672dcc193312d2e72e13048cc68ec00ec4d6e;hpb=d37856b8d3033144818786de1c5c5b898fe2946e;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index 288672dcc..43f76a4aa 100644
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -28,7 +28,7 @@
 
 #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>
 
@@ -53,6 +53,7 @@ struct relay_session {
 	 */
 	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];
@@ -133,6 +134,11 @@ 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;
+	/*
+	 * Prevent live viewers from taking of copy of the chunk
+	 * while new chunk has a temporary directory name.
+	 */
+	bool ongoing_rotation;
 	struct rcu_head rcu_node;	/* For call_rcu teardown. */
 };
 
@@ -154,8 +160,8 @@ void session_put(struct relay_session *session);
 int session_close(struct relay_session *session);
 int session_abort(struct relay_session *session);
 
-int session_init_output_directory_handle(struct relay_session *session,
-		struct lttng_directory_handle *handle);
+struct lttng_directory_handle *session_create_output_directory_handle(
+		struct relay_session *session);
 
 void print_sessions(void);