Fix: improve error message when UST support is disabled

[lttng-tools.git] / src / bin / lttng-sessiond / ust-app.h

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 30835e03fb064523b6298073e656b99b33bcf0ae..c9c47284c70a0a7a7558da949d839ceb2cbab7a6 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -102,6 +102,7 @@ struct ust_app_ctx {
        struct lttng_ust_context ctx;
        struct lttng_ust_object_data *obj;
        struct lttng_ht_node_ulong node;
+       struct cds_list_head list;
 };
 
 struct ust_app_event {
@@ -141,7 +142,14 @@ struct ust_app_channel {
        struct ust_app_stream_list streams;
        /* Session pointer that owns this object. */
        struct ust_app_session *session;
+       /*
+        * Contexts are kept in a hash table for fast lookup and in an ordered list
+        * so we are able to enable them on the tracer side in the same order the
+        * user added them.
+        */
        struct lttng_ht *ctx;
+       struct cds_list_head ctx_list;
+
        struct lttng_ht *events;
        uint64_t tracefile_size;
        uint64_t tracefile_count;
@@ -175,10 +183,10 @@ struct ust_app_session {
         * Tracing session ID. Multiple ust app session can have the same tracing
         * session id making this value NOT unique to the object.
         */
-       int tracing_id;
+       uint64_t tracing_id;
        uint64_t id;    /* Unique session identifier */
        struct lttng_ht *channels; /* Registered channels */
-       struct lttng_ht_node_ulong node;
+       struct lttng_ht_node_u64 node;
        char path[PATH_MAX];
        /* UID/GID of the application owning the session */
        uid_t uid;
@@ -307,6 +315,12 @@ ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
                struct consumer_socket *socket, int send_zero_data);
 void ust_app_destroy(struct ust_app *app);
 
+static inline
+int ust_app_supported(void)
+{
+       return 1;
+}
+
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
 static inline
@@ -504,6 +518,12 @@ void ust_app_destroy(struct ust_app *app)
        return;
 }
 
+static inline
+int ust_app_supported(void)
+{
+       return 0;
+}
+
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTT_UST_APP_H */