X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.h;h=bb092cae56158d98a10dfc623f15532c4ba80845;hp=e834d2f6e1d0c1391922b7a2c6552953cab552f8;hb=daf282ab93462198c6acd16b4aa624635df1bea5;hpb=34378f76da406ecbdfdb8a0c98245666d83bc1b9

diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
index e834d2f6e..bb092cae5 100644
--- 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);