Introduce build/env/argument override for 32-bit compat consumer

[lttng-tools.git] / lttng-sessiond / trace-ust.h

diff --git a/lttng-sessiond/trace-ust.h b/lttng-sessiond/trace-ust.h
index aea7e714f03b27b2909c29b225012d3774e19397..f0b639cba23da1fa68902450f6ce3278ea34b556 100644 (file)
--- 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;
        /*
@@ -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 */