X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-sessiond%2Ftrace-ust.h;h=5a6cade9ab7fb1c19e31a202ff26bcdd984a297d;hb=6df2e2c977b698cc6b8f15c90b649516674028f9;hp=9235ca62c837e261e682b671a6a9e7262ea5fb84;hpb=3735745270b83fc911d8ee39c8437256b3af4e3d;p=lttng-tools.git

diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
index 9235ca62c..5a6cade9a 100644
--- a/lttng-sessiond/trace-ust.h
+++ b/lttng-sessiond/trace-ust.h
@@ -99,9 +99,7 @@ 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;
@@ -112,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
@@ -127,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
@@ -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 */