X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-sessiond%2Ftrace-ust.h;h=18d3b5fc75e8586c0ca217d550db3592f3d2f6fb;hb=9fdb49d8eac3ff67f553743fb8ce0edee14c3ab6;hp=35683ebce6b95970694da76d7d74de34be36a8e0;hpb=74d0b6427faafd5f5d59b7e9d5f78ac52924a7a2;p=lttng-tools.git

diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
index 35683ebce..18d3b5fc7 100644
--- a/lttng-sessiond/trace-ust.h
+++ b/lttng-sessiond/trace-ust.h
@@ -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;
@@ -53,11 +54,13 @@ struct ltt_ust_stream {
 	int handle;
 	char pathname[PATH_MAX];
 	struct lttng_ust_object_data *obj;
-	struct cds_lfht_node node;
+	/* Using a list of streams to keep order. */
+	struct cds_list_head list;
 };
 
 /* 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,8 +100,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 start_trace;
 	char pathname[PATH_MAX];
 	struct ltt_ust_domain_global domain_global;
 	/*
@@ -129,6 +131,8 @@ 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