Tests: fix validation trace path in kernel snapshot

[lttng-tools.git] / src / bin / lttng-sessiond / session.h

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index ebb65bfd833836ab6a648aaacd22ae672fbe91bd..63b5a068d033462f4d1167b46c0a78d9aa42cfd8 100644 (file)
--- 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
@@ -31,19 +35,19 @@
  */
 struct ltt_session_list {
        /*
-        * This lock protects any read/write access to the list and count (which is
-        * basically the list size). All public functions in session.c acquire this
-        * lock and release it before returning. If none of those functions are
-        * used, the lock MUST be acquired in order to iterate or/and do any
-        * actions on that list.
+        * This lock protects any read/write access to the list and
+        * next_uuid. All public functions in session.c acquire this
+        * lock and release it before returning. If none of those
+        * functions are used, the lock MUST be acquired in order to
+        * iterate or/and do any actions on that list.
         */
        pthread_mutex_t lock;
 
        /*
-        * Number of element in the list. The session list lock MUST be acquired if
-        * this counter is used when iterating over the session list.
+        * Session unique ID generator. The session list lock MUST be
+        * upon update and read of this counter.
         */
-       unsigned int count;
+       unsigned int next_uuid;
 
        /* Linked list head */
        struct cds_list_head head;
@@ -55,7 +59,6 @@ struct ltt_session_list {
  */
 struct ltt_session {
        char name[NAME_MAX];
-       char path[PATH_MAX];
        struct ltt_kernel_session *kernel_session;
        struct ltt_ust_session *ust_session;
        /*
@@ -82,10 +85,18 @@ struct ltt_session {
         * copied into those sessions.
         */
        struct consumer_output *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;
 };
 
 /* 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);
@@ -96,4 +107,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 */