X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.h;h=3c46984a30f024a27df1d8d04a60d69aa4b44a03;hp=ae7ad3ae380d2751f0b669a8ef0bb5170bffc9e7;hb=36b588eddce05ef840bd247f6a58316925b9a0a2;hpb=d0b96690836f4b876096f3dc14801f8e25281a77 diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h index ae7ad3ae3..3c46984a3 100644 --- a/src/bin/lttng-sessiond/ust-registry.h +++ b/src/bin/lttng-sessiond/ust-registry.h @@ -20,11 +20,12 @@ #include #include -#include #include #include +#include "ust-ctl.h" + #define CTF_SPEC_MAJOR 1 #define CTF_SPEC_MINOR 8 @@ -32,8 +33,7 @@ struct ust_app; struct ust_registry_session { /* - * With multiple writers and readers, use this lock to access - * the registry. Use defined macros above to lock it. + * With multiple writers and readers, use this lock to access the registry. * Can nest within the ust app session lock. */ pthread_mutex_t lock; @@ -60,13 +60,37 @@ struct ust_registry_session { /* Generated metadata. */ char *metadata; /* NOT null-terminated ! Use memcpy. */ size_t metadata_len, metadata_alloc_len; + /* Length of bytes sent to the consumer. */ + size_t metadata_len_sent; + /* + * Hash table containing channels sent by the UST tracer. MUST be accessed + * with a RCU read side lock acquired. + */ + struct lttng_ht *channels; + /* Unique key to identify the metadata on the consumer side. */ + uint64_t metadata_key; + /* + * Indicates if the metadata is closed on the consumer side. This is to + * avoid double close of metadata when an application unregisters AND + * deletes its sessions. + */ + unsigned int metadata_closed; }; struct ust_registry_channel { + uint64_t key; /* Id set when replying to a register channel. */ uint32_t chan_id; enum ustctl_channel_header header_type; + /* + * Flag for this channel if the metadata was dumped once during + * registration. 0 means no, 1 yes. + */ + unsigned int metadata_dumped; + /* Indicates if this channel registry has already been registered. */ + unsigned int register_done; + /* * Hash table containing events sent by the UST tracer. MUST be accessed * with a RCU read side lock acquired. @@ -82,6 +106,9 @@ struct ust_registry_channel { */ size_t nr_ctx_fields; struct ustctl_field *ctx_fields; + struct lttng_ht_node_u64 node; + /* For delayed reclaim */ + struct rcu_head rcu_head; }; /* @@ -100,11 +127,17 @@ struct ust_registry_event { size_t nr_fields; struct ustctl_field *fields; char *model_emf_uri; + struct lttng_ust_object_data *obj; + /* + * Flag for this channel if the metadata was dumped once during + * registration. 0 means no, 1 yes. + */ + unsigned int metadata_dumped; /* * Node in the ust-registry hash table. The event name is used to * initialize the node and the event_name/signature for the match function. */ - struct lttng_ht_node_str node; + struct lttng_ht_node_u64 node; }; /* @@ -166,12 +199,18 @@ static inline uint32_t ust_registry_get_event_count( return (uint32_t) uatomic_read(&r->used_event_id); } -void ust_registry_channel_init(struct ust_registry_session *session, - struct ust_registry_channel *chan); +#ifdef HAVE_LIBLTTNG_UST_CTL + void ust_registry_channel_destroy(struct ust_registry_session *session, struct ust_registry_channel *chan); +struct ust_registry_channel *ust_registry_channel_find( + struct ust_registry_session *session, uint64_t key); +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); -int ust_registry_session_init(struct ust_registry_session *session, +int ust_registry_session_init(struct ust_registry_session **sessionp, struct ust_app *app, uint32_t bits_per_long, uint32_t uint8_t_alignment, @@ -179,15 +218,15 @@ int ust_registry_session_init(struct ust_registry_session *session, uint32_t uint32_t_alignment, uint32_t uint64_t_alignment, uint32_t long_alignment, - int byte_order); - + int byte_order, + uint32_t major, + uint32_t minor); void ust_registry_session_destroy(struct ust_registry_session *session); int ust_registry_create_event(struct ust_registry_session *session, - struct ust_registry_channel *channel, - int session_objd, int channel_objd, char *name, char *sig, - size_t nr_fields, struct ustctl_field *fields, int loglevel, - char *model_emf_uri, uint32_t *event_id); + 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_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, @@ -195,11 +234,91 @@ void ust_registry_destroy_event(struct ust_registry_channel *chan, /* app can be NULL for registry shared across applications. */ int ust_metadata_session_statedump(struct ust_registry_session *session, - struct ust_app *app); + struct ust_app *app, uint32_t major, uint32_t minor); int ust_metadata_channel_statedump(struct ust_registry_session *session, struct ust_registry_channel *chan); int ust_metadata_event_statedump(struct ust_registry_session *session, struct ust_registry_channel *chan, struct ust_registry_event *event); +#else /* HAVE_LIBLTTNG_UST_CTL */ + +static inline +void ust_registry_channel_destroy(struct ust_registry_session *session, + struct ust_registry_channel *chan) +{} +static inline +struct ust_registry_channel *ust_registry_channel_find( + struct ust_registry_session *session, uint64_t key) +{ + return NULL; +} +static inline +int ust_registry_channel_add(struct ust_registry_session *session, + uint64_t key) +{ + return 0; +} +static inline +void ust_registry_channel_del_free(struct ust_registry_session *session, + uint64_t key) +{} +static inline +int ust_registry_session_init(struct ust_registry_session **sessionp, + struct ust_app *app, + uint32_t bits_per_long, + uint32_t uint8_t_alignment, + uint32_t uint16_t_alignment, + uint32_t uint32_t_alignment, + uint32_t uint64_t_alignment, + uint32_t long_alignment, + int byte_order) +{ + return 0; +} +static inline +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) +{ + return 0; +} +static inline +struct ust_registry_event *ust_registry_find_event( + struct ust_registry_channel *chan, char *name, char *sig) +{ + return NULL; +} +static inline +void ust_registry_destroy_event(struct ust_registry_channel *chan, + struct ust_registry_event *event) +{} + +/* 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) +{ + return 0; +} +static inline +int ust_metadata_channel_statedump(struct ust_registry_session *session, + struct ust_registry_channel *chan) +{ + return 0; +} +static inline +int ust_metadata_event_statedump(struct ust_registry_session *session, + struct ust_registry_channel *chan, + struct ust_registry_event *event) +{ + return 0; +} + +#endif /* HAVE_LIBLTTNG_UST_CTL */ + #endif /* LTTNG_UST_REGISTRY_H */