relayd: share the same output directory handle accross sessions

[lttng-tools.git] / src / bin / lttng-relayd / session.h

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index b3d99012d2fa4369a583619858ba99ed3fc98afc..fa48d0974b57eb0580dbf28e75e5dd0bcc30863e 100644 (file)
--- 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,9 +53,17 @@ 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];
+       /*
+        * 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. */
@@ -88,6 +96,8 @@ 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;
@@ -124,6 +134,12 @@ 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 lttng_directory_handle *output_directory;
        struct rcu_head rcu_node;       /* For call_rcu teardown. */
 };