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 18d3b5fc75e8586c0ca217d550db3592f3d2f6fb..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 {
@@ -99,7 +99,7 @@ struct ltt_ust_domain_exec {
 
 /* UST session */
 struct ltt_ust_session {
-       int uid;   /* Unique identifier of session */
+       int id;    /* Unique identifier of session */
        int start_trace;
        char pathname[PATH_MAX];
        struct ltt_ust_domain_global domain_global;
@@ -110,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
@@ -125,7 +128,7 @@ 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);
@@ -201,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 */