X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=de98bde514f4e62d56984faa455d7905f1dd3325;hp=b90e8f4677f8530227825e3671639cf1b3bf0547;hb=59a8d3ecc8cbc7e00354a18b591f1a83304849d7;hpb=a4b92340642035d1eafeb1eead0ad01f64d2007d

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index b90e8f467..de98bde51 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -20,8 +20,12 @@
 
 #include <urcu/list.h>
 
+#include <common/hashtable/hashtable.h>
+
+#include "snapshot.h"
 #include "trace-kernel.h"
-#include "trace-ust.h"
+
+struct ltt_ust_session;
 
 /*
  * Tracing session list
@@ -43,7 +47,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;
@@ -55,7 +59,8 @@ struct ltt_session_list {
  */
 struct ltt_session {
 	char name[NAME_MAX];
-	char path[PATH_MAX];
+	/* FIXME : size */
+	char hostname[PATH_MAX]; /* local hostname, FIXME : could be useful to have that user defined too */
 	struct ltt_kernel_session *kernel_session;
 	struct ltt_ust_session *ust_session;
 	/*
@@ -66,7 +71,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;
@@ -83,12 +88,27 @@ struct ltt_session {
 	 */
 	struct consumer_output *consumer;
 
-	/* Indicates whether or not we have to spawn consumer(s) */
-	unsigned int start_consumer;
+	/* Did a start command occured before the kern/ust session creation? */
+	unsigned int started;
+
+	/* 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.
+	 */
+	int live_timer;
 };
 
 /* 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);
@@ -99,4 +119,6 @@ void session_unlock_list(void);
 struct ltt_session *session_find_by_name(char *name);
 struct ltt_session_list *session_get_list(void);
 
+int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid);
+
 #endif /* _LTT_SESSION_H */