relayd protocol: reply path for close chunk and create session 2.11

[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 8b8ae1f2118d33e31ae989b72488aa3c515b6f10..2a034daf34e8b448f37fa8f6e301ffe4cd90a119 100644 (file)
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -55,6 +55,14 @@ struct relay_session {
        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. */
@@ -86,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;
 
@@ -120,11 +132,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;
        struct rcu_head rcu_node;       /* For call_rcu teardown. */
 };
 
 struct relay_session *session_create(const char *session_name,
-               const char *hostname,
+               const char *hostname, const char *base_path,
                uint32_t live_timer,
                bool snapshot,
                const lttng_uuid sessiond_uuid,
@@ -132,7 +145,8 @@ struct relay_session *session_create(const char *session_name,
                const uint64_t *current_chunk_id,
                const time_t *creation_time,
                uint32_t major,
-               uint32_t minor);
+               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);