centralize sessiond config option handling

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

diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h
index a8466ebf58c64c9260968e77a8e0573925f9b959..414975cafc4b1f3b209e49ce5900c7373e18f2dd 100644 (file)
--- a/src/bin/lttng-sessiond/ust-registry.h
+++ b/src/bin/lttng-sessiond/ust-registry.h
@@ -68,6 +68,8 @@ struct ust_registry_session {
        size_t metadata_len, metadata_alloc_len;
        /* Length of bytes sent to the consumer. */
        size_t metadata_len_sent;
+       /* Current version of the metadata. */
+       uint64_t metadata_version;
 
        char root_shm_path[PATH_MAX];
        char shm_path[PATH_MAX];
@@ -96,10 +98,18 @@ struct ust_registry_session {
 
        /* Enumerations table. */
        struct lttng_ht *enums;
+
+       /*
+        * Copy of the tracer version when the first app is registered.
+        * It is used if we need to regenerate the metadata.
+        */
+       uint32_t major;
+       uint32_t minor;
 };
 
 struct ust_registry_channel {
        uint64_t key;
+       uint64_t consumer_key;
        /* Id set when replying to a register channel. */
        uint32_t chan_id;
        enum ustctl_channel_header header_type;
@@ -239,7 +249,7 @@ struct ust_registry_channel *ust_registry_channel_find(
 int ust_registry_channel_add(struct ust_registry_session *session,
                uint64_t key);
 void ust_registry_channel_del_free(struct ust_registry_session *session,
-               uint64_t key);
+               uint64_t key, bool notif);
 
 int ust_registry_session_init(struct ust_registry_session **sessionp,
                struct ust_app *app,
@@ -304,7 +314,7 @@ int ust_registry_channel_add(struct ust_registry_session *session,
 }
 static inline
 void ust_registry_channel_del_free(struct ust_registry_session *session,
-               uint64_t key)
+               uint64_t key, bool notif)
 {}
 static inline
 int ust_registry_session_init(struct ust_registry_session **sessionp,
@@ -345,7 +355,7 @@ void ust_registry_destroy_event(struct ust_registry_channel *chan,
 /* The app object can be NULL for registry shared across applications. */
 static inline
 int ust_metadata_session_statedump(struct ust_registry_session *session,
-               struct ust_app *app)
+               struct ust_app *app, uint32_t major, uint32_t minor)
 {
        return 0;
 }