X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.h;h=3a9b92436f3aa44601d8b65ea0b050fe06b5bce3;hp=1a37cfee2069800be941eeb4f875354270c1ecdc;hb=ce0b1d61919f37517a6212f7af2afe0fa1b1dcb0;hpb=7591bab11eceedc6a0d1e02fd6f85592267a63b5

diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index 1a37cfee2..3a9b92436 100644
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -2,22 +2,12 @@
 #define _SESSION_H
 
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <limits.h>
@@ -26,7 +16,11 @@
 #include <urcu/list.h>
 #include <urcu/ref.h>
 
+#include <lttng/constant.h>
 #include <common/hashtable/hashtable.h>
+#include <common/uuid.h>
+#include <common/trace-chunk.h>
+#include <common/optional.h>
 
 /*
  * Represents a session for the relay point of view
@@ -38,8 +32,33 @@ struct relay_session {
 	 * It is used to match a set of streams to their session.
 	 */
 	uint64_t id;
-	char session_name[NAME_MAX];
-	char hostname[HOST_NAME_MAX];
+	/*
+	 * 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;
+	/*
+	 * Contains the creation time on the session daemon's end for 2.11+
+	 * peers. Otherwise, this contains the session creation time on the
+	 * relay daemon's end.
+	 */
+	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. */
@@ -53,8 +72,6 @@ struct relay_session {
 	 */
 
 	struct urcu_ref ref;
-	/* session reflock nests inside ctf_trace reflock. */
-	pthread_mutex_t reflock;
 
 	pthread_mutex_t lock;
 
@@ -66,6 +83,17 @@ struct relay_session {
 	/* Tell if the session connection has been closed on the streaming side. */
 	bool connection_closed;
 
+	/*
+	 * Tell if the session is currently living in a exiting relayd and
+	 * should be cleaned forcefully without waiting for pending data or
+	 * pending ctrl data.
+	 */
+	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;
 
@@ -99,17 +127,35 @@ struct relay_session {
 	 * session_list_lock. Traversals are protected by RCU.
 	 */
 	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. */
 };
 
 struct relay_session *session_create(const char *session_name,
-		const char *hostname, uint32_t live_timer,
-		bool snapshot, 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);
 
 int session_close(struct relay_session *session);
+int session_abort(struct relay_session *session);
+
 void print_sessions(void);
 
 #endif /* _SESSION_H */