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 6264e14ac4f0b6430fd06f9960e0c9915e539fa2..63b5a068d033462f4d1167b46c0a78d9aa42cfd8 100644 (file)
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -1,30 +1,31 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * 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.
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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.
  */
 
 #ifndef _LTT_SESSION_H
 #define _LTT_SESSION_H
 
-#include <pthread.h>
-#include <unistd.h>
 #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
@@ -34,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;
@@ -58,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;
        /*
@@ -69,14 +69,34 @@ struct ltt_session {
        pthread_mutex_t lock;
        struct cds_list_head list;
        int enabled;    /* enabled/started flag */
-       int id;         /* session unique identifier */
+       unsigned int id;                /* session unique identifier */
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;
+       /*
+        * Network session handle. A value of 0 means that there is no remote
+        * session established.
+        */
+       uint64_t net_handle;
+       /*
+        * This consumer is only set when the create_session_uri call is made.
+        * This contains the temporary information for a consumer output. Upon
+        * creation of the UST or kernel session, this consumer, if available, is
+        * 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);
@@ -87,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 */