X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=77f0bf7b1ee87ac4a7b7cd43c731ca0d63701ac4;hp=fd23ab05ed90bb422779446d7dd3961bc862f1da;hb=b99a8d4211e26a847ca8916884354f159c999ad2;hpb=6151a90fe7fa3dea52c57771df9083e56de7a60b

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index fd23ab05e..77f0bf7b1 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -18,8 +18,12 @@
 #ifndef _LTT_SESSION_H
 #define _LTT_SESSION_H
 
+#include <limits.h>
 #include <urcu/list.h>
 
+#include <common/hashtable/hashtable.h>
+
+#include "snapshot.h"
 #include "trace-kernel.h"
 
 struct ltt_ust_session;
@@ -44,7 +48,7 @@ struct ltt_session_list {
 	 * Session unique ID generator. The session list lock MUST be
 	 * upon update and read of this counter.
 	 */
-	unsigned int next_uuid;
+	uint64_t next_uuid;
 
 	/* Linked list head */
 	struct cds_list_head head;
@@ -56,7 +60,7 @@ struct ltt_session_list {
  */
 struct ltt_session {
 	char name[NAME_MAX];
-	char path[PATH_MAX];
+	char hostname[HOST_NAME_MAX]; /* Local hostname. */
 	struct ltt_kernel_session *kernel_session;
 	struct ltt_ust_session *ust_session;
 	/*
@@ -66,8 +70,7 @@ struct ltt_session {
 	 */
 	pthread_mutex_t lock;
 	struct cds_list_head list;
-	int enabled;	/* enabled/started flag */
-	unsigned int id;		/* session unique identifier */
+	uint64_t id;		/* session unique identifier */
 	/* UID/GID of the user owning the session */
 	uid_t uid;
 	gid_t gid;
@@ -84,12 +87,40 @@ struct ltt_session {
 	 */
 	struct consumer_output *consumer;
 
-	/* Did a start command occured before the kern/ust session creation? */
-	unsigned int started;
+	/* Did at least ONE start command has been triggered?. */
+	unsigned int has_been_started:1;
+	/*
+	 * Is the session active? Start trace command sets this to 1 and the stop
+	 * command reset it to 0.
+	 */
+	unsigned int active:1;
+
+	/* Snapshot representation in a session. */
+	struct snapshot snapshot;
+	/* Indicate if the session has to output the traces or not. */
+	unsigned int output_traces;
+	/*
+	 * This session is in snapshot mode. This means that every channel enabled
+	 * will be set in overwrite mode and mmap. It is considered exclusively for
+	 * snapshot purposes.
+	 */
+	unsigned int snapshot_mode;
+	/*
+	 * Timer set when the session is created for live reading.
+	 */
+	unsigned int live_timer;
+	/*
+	 * Path where to keep the shared memory files.
+	 */
+	char shm_path[PATH_MAX];
+	/*
+	 * Node in ltt_sessions_ht_by_id.
+	 */
+	struct lttng_ht_node_u64 node;
 };
 
 /* Prototypes */
-int session_create(char *name, char *path, uid_t uid, gid_t gid);
+int session_create(char *name, uid_t uid, gid_t gid);
 int session_destroy(struct ltt_session *session);
 
 void session_lock(struct ltt_session *session);
@@ -97,7 +128,8 @@ void session_lock_list(void);
 void session_unlock(struct ltt_session *session);
 void session_unlock_list(void);
 
-struct ltt_session *session_find_by_name(char *name);
+struct ltt_session *session_find_by_name(const char *name);
+struct ltt_session *session_find_by_id(uint64_t id);
 struct ltt_session_list *session_get_list(void);
 
 int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid);