Move hash table to common/ directory

[lttng-tools.git] / lttng-sessiond / trace-ust.h

diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
index 604024b18b00f7e56c4da266ef9ea518096c4307..bb092cae56158d98a10dfc623f15532c4ba80845 100644 (file)
--- a/lttng-sessiond/trace-ust.h
+++ b/lttng-sessiond/trace-ust.h
@@ -27,7 +27,7 @@
 
 #include "ust-ctl.h"
 
-#include "../hashtable/rculfhash.h"
+#include "../common/hashtable.h"
 
 /* UST Stream list */
 struct ltt_ust_stream_list {
@@ -43,6 +43,7 @@ struct ltt_ust_context {
 
 /* UST event */
 struct ltt_ust_event {
+       unsigned int enabled;
        struct lttng_ust_event attr;
        struct cds_lfht *ctx;
        struct cds_lfht_node node;
@@ -59,6 +60,7 @@ struct ltt_ust_stream {
 
 /* UST channel */
 struct ltt_ust_channel {
+       unsigned int enabled;
        char name[LTTNG_UST_SYM_NAME_LEN];
        char pathname[PATH_MAX];
        struct lttng_ust_channel attr;
@@ -97,9 +99,8 @@ struct ltt_ust_domain_exec {
 
 /* UST session */
 struct ltt_ust_session {
-       int uid;   /* Unique identifier of session */
-       int consumer_fds_sent;
-       int consumer_fd;
+       int id;    /* Unique identifier of session */
+       int start_trace;
        char pathname[PATH_MAX];
        struct ltt_ust_domain_global domain_global;
        /*
@@ -109,6 +110,9 @@ struct ltt_ust_session {
         */
        struct cds_lfht *domain_pid;
        struct cds_lfht *domain_exec;
+       /* UID/GID of the user owning the session */
+       uid_t uid;
+       gid_t gid;
 };
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
@@ -124,12 +128,14 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht,
 /*
  * Create functions malloc() the data structure.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
+struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
                struct lttng_domain *domain);
 struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
                char *path);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev);
 struct ltt_ust_metadata *trace_ust_create_metadata(char *path);
+struct ltt_ust_context *trace_ust_create_context(
+               struct lttng_event_context *ctx);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if
@@ -198,6 +204,12 @@ static inline
 void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
 }
+static inline
+struct ltt_ust_context *trace_ust_create_context(
+               struct lttng_event_context *ctx)
+{
+       return NULL;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */