X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.h;h=a22009efa996263cf9a17b2fe08941b5a088f92a;hp=04bbaa0e9f3c94b385ffa4248d5882bc021761e2;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hpb=45893984238b2e2c12fc0d84b90336c98a6d98c9 diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h index 04bbaa0e9..a22009efa 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 @@ -33,8 +34,11 @@ 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. - * Can nest within the ust app session lock. + * the registry. Can nest within the ust app session lock. + * Also acts as a registry serialization lock. Used by registry + * readers to serialize the registry information sent from the + * sessiond to the consumerd. + * The consumer socket lock nests within this lock. */ pthread_mutex_t lock; /* Next channel ID available for a newly registered channel. */ @@ -62,11 +66,26 @@ struct ust_registry_session { size_t metadata_len, metadata_alloc_len; /* Length of bytes sent to the consumer. */ size_t metadata_len_sent; + + char shm_path[PATH_MAX]; + char metadata_path[PATH_MAX]; + int metadata_fd; /* file-backed metadata FD */ + /* - * Hash table containing channels sent by the UST tracer. MUST be accessed - * with a RCU read side lock acquired. + * 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 { @@ -75,6 +94,14 @@ struct ust_registry_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. @@ -90,8 +117,9 @@ struct ust_registry_channel { */ size_t nr_ctx_fields; struct ustctl_field *ctx_fields; - /* Hash table node for the session ht indexed by key. */ struct lttng_ht_node_u64 node; + /* For delayed reclaim */ + struct rcu_head rcu_head; }; /* @@ -110,11 +138,16 @@ struct ust_registry_event { size_t nr_fields; struct ustctl_field *fields; char *model_emf_uri; + /* + * 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; }; /* @@ -176,6 +209,8 @@ static inline uint32_t ust_registry_get_event_count( return (uint32_t) uatomic_read(&r->used_event_id); } +#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( @@ -193,13 +228,19 @@ int ust_registry_session_init(struct ust_registry_session **sessionp, 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, + const char *shm_path, + uid_t euid, + gid_t egid); 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, uint32_t *event_id); + 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, @@ -207,11 +248,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 */