Command metadata regenerate

[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 77d4d919518fa1a9cb2eb71eabd4f0ed85e9d108..34db29ea13462ec477f47ae4e8d55646f68a19b2 100644 (file)
--- a/src/bin/lttng-sessiond/ust-registry.h
+++ b/src/bin/lttng-sessiond/ust-registry.h
@@ -45,6 +45,8 @@ struct ust_registry_session {
        uint32_t next_channel_id;
        /* Once this value reaches UINT32_MAX, no more id can be allocated. */
        uint32_t used_channel_id;
+       /* Next enumeration ID available. */
+       uint64_t next_enum_id;
        /* Universal unique identifier used by the tracer. */
        unsigned char uuid[UUID_LEN];
 
@@ -66,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];
@@ -91,6 +95,16 @@ struct ust_registry_session {
        /* User and group owning the session. */
        uid_t uid;
        gid_t gid;
+
+       /* 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 {
@@ -139,7 +153,7 @@ struct ust_registry_event {
        /* Name of the event returned by the tracer. */
        char name[LTTNG_UST_SYM_NAME_LEN];
        char *signature;
-       int loglevel;
+       int loglevel_value;
        size_t nr_fields;
        struct ustctl_field *fields;
        char *model_emf_uri;
@@ -155,6 +169,17 @@ struct ust_registry_event {
        struct lttng_ht_node_u64 node;
 };
 
+struct ust_registry_enum {
+       char name[LTTNG_UST_SYM_NAME_LEN];
+       struct ustctl_enum_entry *entries;
+       size_t nr_entries;
+       uint64_t id;    /* enum id in session */
+       /* Enumeration node in session hash table. */
+       struct lttng_ht_node_str node;
+       /* For delayed reclaim. */
+       struct rcu_head rcu_head;
+};
+
 /*
  * Validate that the id has reached the maximum allowed or not.
  *
@@ -244,9 +269,9 @@ void ust_registry_session_destroy(struct ust_registry_session *session);
 
 int ust_registry_create_event(struct ust_registry_session *session,
                uint64_t chan_key, int session_objd, int channel_objd, char *name,
-               char *sig, size_t nr_fields, struct ustctl_field *fields, int loglevel,
-               char *model_emf_uri, int buffer_type, uint32_t *event_id_p,
-               struct ust_app *app);
+               char *sig, size_t nr_fields, struct ustctl_field *fields,
+               int loglevel_value, char *model_emf_uri, int buffer_type,
+               uint32_t *event_id_p, struct ust_app *app);
 struct ust_registry_event *ust_registry_find_event(
                struct ust_registry_channel *chan, char *name, char *sig);
 void ust_registry_destroy_event(struct ust_registry_channel *chan,
@@ -260,6 +285,13 @@ int ust_metadata_channel_statedump(struct ust_registry_session *session,
 int ust_metadata_event_statedump(struct ust_registry_session *session,
                struct ust_registry_channel *chan,
                struct ust_registry_event *event);
+int ust_registry_create_or_find_enum(struct ust_registry_session *session,
+               int session_objd, char *name,
+               struct ustctl_enum_entry *entries, size_t nr_entries,
+               uint64_t *enum_id);
+struct ust_registry_enum *
+       ust_registry_lookup_enum_by_id(struct ust_registry_session *session,
+               const char *name, uint64_t id);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -302,8 +334,9 @@ void ust_registry_session_destroy(struct ust_registry_session *session)
 static inline
 int ust_registry_create_event(struct ust_registry_session *session,
                uint64_t chan_key, int session_objd, int channel_objd, char *name,
-               char *sig, size_t nr_fields, struct ustctl_field *fields, int loglevel,
-               char *model_emf_uri, int buffer_type, uint32_t *event_id_p)
+               char *sig, size_t nr_fields, struct ustctl_field *fields,
+               int loglevel_value, char *model_emf_uri, int buffer_type,
+               uint32_t *event_id_p)
 {
        return 0;
 }
@@ -338,6 +371,21 @@ int ust_metadata_event_statedump(struct ust_registry_session *session,
 {
        return 0;
 }
+static inline
+int ust_registry_create_or_find_enum(struct ust_registry_session *session,
+               int session_objd, char *name,
+               struct ustctl_enum_entry *entries, size_t nr_entries,
+               uint64_t *enum_id)
+{
+       return 0;
+}
+static inline
+struct ust_registry_enum *
+       ust_registry_lookup_enum_by_id(struct ust_registry_session *session,
+               const char *name, uint64_t id)
+{
+       return NULL;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */