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

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 2bd2fd0ba..77f0bf7b1 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -18,6 +18,7 @@
 #ifndef _LTT_SESSION_H
 #define _LTT_SESSION_H
 
+#include <limits.h>
 #include <urcu/list.h>
 
 #include <common/hashtable/hashtable.h>
@@ -59,6 +60,7 @@ struct ltt_session_list {
  */
 struct ltt_session {
 	char name[NAME_MAX];
+	char hostname[HOST_NAME_MAX]; /* Local hostname. */
 	struct ltt_kernel_session *kernel_session;
 	struct ltt_ust_session *ust_session;
 	/*
@@ -68,7 +70,6 @@ struct ltt_session {
 	 */
 	pthread_mutex_t lock;
 	struct cds_list_head list;
-	int enabled;	/* enabled/started flag */
 	uint64_t id;		/* session unique identifier */
 	/* UID/GID of the user owning the session */
 	uid_t uid;
@@ -86,8 +87,13 @@ 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;
@@ -102,7 +108,15 @@ struct ltt_session {
 	/*
 	 * Timer set when the session is created for live reading.
 	 */
-	int live_timer;
+	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 */
@@ -114,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);