X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Ftrace-ust.h;h=f2ec7405f83fe4ca4e35b418fba0724f2b02bf20;hb=dbdbd482ead909120dc3c4e4b6e41413b7fa57a1;hp=aea7e714f03b27b2909c29b225012d3774e19397;hpb=322585731ced1adba36cddcb8bdd5d997d1b2e3e;p=lttng-tools.git

diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
index aea7e714f..f2ec7405f 100644
--- a/lttng-sessiond/trace-ust.h
+++ b/lttng-sessiond/trace-ust.h
@@ -53,7 +53,8 @@ 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 */
@@ -99,6 +100,7 @@ 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;
 	/*
@@ -110,7 +112,7 @@ struct ltt_ust_session {
 	struct cds_lfht *domain_exec;
 };
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 
 /*
  * Lookup functions. NULL is returned if not found.
@@ -139,7 +141,7 @@ void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata);
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
 void trace_ust_destroy_event(struct ltt_ust_event *event);
 
-#else
+#else /* HAVE_LIBLTTNG_UST_CTL */
 
 static inline
 struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
@@ -198,6 +200,6 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
 }
 
-#endif /* CONFIG_CONFIG_LTTNG_TOOLS_HAVE_UST */
+#endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTT_TRACE_UST_H */