X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fust-events-internal.h;h=e568d5ee352a81aa8af0658c4fc12062f54e54fb;hb=68f882666d2a83f061d702d154983a61987e25e2;hp=ec2b8e4b67ca2858229075480d222bebe1959608;hpb=b1f720f08ebd9f83045a8ed7689658b8171a8adf;p=lttng-ust.git diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h index ec2b8e4b..e568d5ee 100644 --- a/liblttng-ust/ust-events-internal.h +++ b/liblttng-ust/ust-events-internal.h @@ -12,9 +12,9 @@ #include #include -#include #include +#include "ust-context-provider.h" struct lttng_ust_abi_obj; @@ -79,7 +79,7 @@ struct lttng_event_enabler { * Unused, but kept around to make it explicit that the tracer can do * it. */ - struct lttng_ctx *ctx; + struct lttng_ust_ctx *ctx; }; struct lttng_event_notifier_enabler { @@ -164,6 +164,26 @@ struct lttng_counter_dimension { uint8_t has_overflow; }; +struct lttng_counter_ops { + struct lib_counter *(*counter_create)(size_t nr_dimensions, + const struct lttng_counter_dimension *dimensions, + int64_t global_sum_step, + int global_counter_fd, + int nr_counter_cpu_fds, + const int *counter_cpu_fds, + bool is_daemon); + void (*counter_destroy)(struct lib_counter *counter); + int (*counter_add)(struct lib_counter *counter, + const size_t *dimension_indexes, int64_t v); + int (*counter_read)(struct lib_counter *counter, + const size_t *dimension_indexes, int cpu, + int64_t *value, bool *overflow, bool *underflow); + int (*counter_aggregate)(struct lib_counter *counter, + const size_t *dimension_indexes, int64_t *value, + bool *overflow, bool *underflow); + int (*counter_clear)(struct lib_counter *counter, const size_t *dimension_indexes); +}; + struct lttng_counter { int objd; struct lttng_event_notifier_group *event_notifier_group; /* owner */ @@ -172,6 +192,26 @@ struct lttng_counter { struct lttng_counter_ops *ops; }; +#define LTTNG_UST_EVENT_HT_BITS 12 +#define LTTNG_UST_EVENT_HT_SIZE (1U << LTTNG_UST_EVENT_HT_BITS) + +struct lttng_ust_event_ht { + struct cds_hlist_head table[LTTNG_UST_EVENT_HT_SIZE]; +}; + +#define LTTNG_UST_EVENT_NOTIFIER_HT_BITS 12 +#define LTTNG_UST_EVENT_NOTIFIER_HT_SIZE (1U << LTTNG_UST_EVENT_NOTIFIER_HT_BITS) +struct lttng_ust_event_notifier_ht { + struct cds_hlist_head table[LTTNG_UST_EVENT_NOTIFIER_HT_SIZE]; +}; + +#define LTTNG_UST_ENUM_HT_BITS 12 +#define LTTNG_UST_ENUM_HT_SIZE (1U << LTTNG_UST_ENUM_HT_BITS) + +struct lttng_ust_enum_ht { + struct cds_hlist_head table[LTTNG_UST_ENUM_HT_SIZE]; +}; + struct lttng_event_notifier_group { int objd; void *owner; @@ -180,7 +220,7 @@ struct lttng_event_notifier_group { struct cds_list_head enablers_head; struct cds_list_head event_notifiers_head; /* list of event_notifiers */ struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */ - struct lttng_ctx *ctx; /* contexts for filters. */ + struct lttng_ust_ctx *ctx; /* contexts for filters. */ struct lttng_counter *error_counter; size_t error_counter_len; @@ -189,7 +229,7 @@ struct lttng_event_notifier_group { struct lttng_transport { char *name; struct cds_list_head node; - struct lttng_channel_ops ops; + struct lttng_ust_channel_ops ops; const struct lttng_ust_lib_ring_buffer_config *client_config; }; @@ -203,7 +243,7 @@ struct lttng_counter_transport { struct lttng_ust_event_common_private { struct lttng_ust_event_common *pub; /* Public event interface */ - const struct lttng_event_desc *desc; + const struct lttng_ust_event_desc *desc; /* Backward references: list of lttng_enabler_ref (ref to enablers) */ struct cds_list_head enablers_ref_head; int registered; /* has reg'd tracepoint probe */ @@ -214,19 +254,19 @@ struct lttng_ust_event_recorder_private { struct lttng_ust_event_common_private parent; struct lttng_ust_event_recorder *pub; /* Public event interface */ - struct cds_list_head node; /* Event list in session */ - struct cds_hlist_node hlist; /* session ht of events */ + struct cds_list_head node; /* Event recorder list */ + struct cds_hlist_node hlist; /* Hash table of event recorders */ }; struct lttng_ust_event_notifier_private { struct lttng_ust_event_common_private parent; struct lttng_ust_event_notifier *pub; /* Public event notifier interface */ - struct cds_hlist_node hlist; /* hashtable of event_notifiers */ - struct cds_list_head node; /* event_notifier list in session */ struct lttng_event_notifier_group *group; /* weak ref */ size_t num_captures; /* Needed to allocate the msgpack array. */ uint64_t error_counter_index; + struct cds_list_head node; /* Event notifier list */ + struct cds_hlist_node hlist; /* Hash table of event notifiers */ }; struct lttng_ust_bytecode_runtime_private { @@ -238,7 +278,7 @@ struct lttng_ust_bytecode_runtime_private { * Pointer to a URCU-protected pointer owned by an `struct * lttng_session`or `struct lttng_event_notifier_group`. */ - struct lttng_ctx **pctx; + struct lttng_ust_ctx **pctx; }; struct lttng_ust_session_private { @@ -263,7 +303,15 @@ struct lttng_ust_session_private { /* New UST 2.8 */ struct lttng_ust_enum_ht enums_ht; /* ht of enumerations */ struct cds_list_head enums_head; - struct lttng_ctx *ctx; /* contexts for filters. */ + struct lttng_ust_ctx *ctx; /* contexts for filters. */ +}; + +struct lttng_enum { + const struct lttng_ust_enum_desc *desc; + struct lttng_session *session; + struct cds_list_head node; /* Enum list in session */ + struct cds_hlist_node hlist; /* Session ht of enums */ + uint64_t id; /* Enumeration ID in sessiond */ }; static inline @@ -286,7 +334,7 @@ struct lttng_enabler *lttng_event_notifier_enabler_as_enabler( * On success, returns a `struct lttng_event_enabler`, * On memory error, returns NULL. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_event_enabler *lttng_event_enabler_create( enum lttng_enabler_format_type format_type, struct lttng_ust_abi_event *event_param, @@ -295,28 +343,28 @@ struct lttng_event_enabler *lttng_event_enabler_create( /* * Destroy a `struct lttng_event_enabler` object. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) void lttng_event_enabler_destroy(struct lttng_event_enabler *enabler); /* * Enable a `struct lttng_event_enabler` object and all events related to this * enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_enabler_enable(struct lttng_event_enabler *enabler); /* * Disable a `struct lttng_event_enabler` object and all events related to this * enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_enabler_disable(struct lttng_event_enabler *enabler); /* * Attach filter bytecode program to `struct lttng_event_enabler` and all * events related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_enabler_attach_filter_bytecode( struct lttng_event_enabler *enabler, struct lttng_ust_bytecode_node **bytecode); @@ -326,7 +374,7 @@ int lttng_event_enabler_attach_filter_bytecode( * * Not implemented. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler, struct lttng_ust_abi_context *ctx); @@ -334,7 +382,7 @@ int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler, * Attach exclusion list to `struct lttng_event_enabler` and all * events related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *enabler, struct lttng_ust_excluder_node **excluder); @@ -345,9 +393,9 @@ int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *enabler, * This function goes over all bytecode programs of the enabler (event or * event_notifier enabler) to ensure each is linked to the provided instance. */ -LTTNG_HIDDEN -void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, - struct lttng_ctx **ctx, +__attribute__((visibility("hidden"))) +void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc, + struct lttng_ust_ctx **ctx, struct cds_list_head *instance_bytecode_runtime_head, struct cds_list_head *enabler_bytecode_runtime_head); @@ -357,13 +405,13 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, * On success, returns a `struct lttng_triggre_group`, * on memory error, returns NULL. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_event_notifier_group *lttng_event_notifier_group_create(void); /* * Destroy a `struct lttng_event_notifier_group` object. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) void lttng_event_notifier_group_destroy( struct lttng_event_notifier_group *event_notifier_group); @@ -373,7 +421,7 @@ void lttng_event_notifier_group_destroy( * On success, returns a `struct lttng_event_notifier_enabler`, * On memory error, returns NULL. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( struct lttng_event_notifier_group *event_notifier_group, enum lttng_enabler_format_type format_type, @@ -382,7 +430,7 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( /* * Destroy a `struct lttng_event_notifier_enabler` object. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) void lttng_event_notifier_enabler_destroy( struct lttng_event_notifier_enabler *event_notifier_enabler); @@ -390,7 +438,7 @@ void lttng_event_notifier_enabler_destroy( * Enable a `struct lttng_event_notifier_enabler` object and all event * notifiers related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_notifier_enabler_enable( struct lttng_event_notifier_enabler *event_notifier_enabler); @@ -398,7 +446,7 @@ int lttng_event_notifier_enabler_enable( * Disable a `struct lttng_event_notifier_enabler` object and all event * notifiers related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_notifier_enabler_disable( struct lttng_event_notifier_enabler *event_notifier_enabler); @@ -406,7 +454,7 @@ int lttng_event_notifier_enabler_disable( * Attach filter bytecode program to `struct lttng_event_notifier_enabler` and * all event notifiers related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_notifier_enabler_attach_filter_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_ust_bytecode_node **bytecode); @@ -415,7 +463,7 @@ int lttng_event_notifier_enabler_attach_filter_bytecode( * Attach capture bytecode program to `struct lttng_event_notifier_enabler` and * all event_notifiers related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_notifier_enabler_attach_capture_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_ust_bytecode_node **bytecode); @@ -424,36 +472,38 @@ int lttng_event_notifier_enabler_attach_capture_bytecode( * Attach exclusion list to `struct lttng_event_notifier_enabler` and all * event notifiers related to this enabler. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_event_notifier_enabler_attach_exclusion( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_ust_excluder_node **excluder); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event); /* * Connect the probe on all enablers matching this event description. * Called on library load. */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_fix_pending_event_notifiers(void); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_counter *lttng_ust_counter_create( const char *counter_transport_name, size_t number_dimensions, const struct lttng_counter_dimension *dimensions); #ifdef HAVE_PERF_EVENT -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_add_perf_counter_to_ctx(uint32_t type, uint64_t config, const char *name, - struct lttng_ctx **ctx); -LTTNG_HIDDEN + struct lttng_ust_ctx **ctx); + +__attribute__((visibility("hidden"))) int lttng_perf_counter_init(void); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_perf_counter_exit(void); #else /* #ifdef HAVE_PERF_EVENT */ @@ -462,7 +512,7 @@ static inline int lttng_add_perf_counter_to_ctx(uint32_t type, uint64_t config, const char *name, - struct lttng_ctx **ctx) + struct lttng_ust_ctx **ctx) { return -ENOSYS; } @@ -477,41 +527,54 @@ void lttng_perf_counter_exit(void) } #endif /* #else #ifdef HAVE_PERF_EVENT */ -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_probes_get_field_list(struct lttng_ust_field_list *list); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_probes_prune_field_list(struct lttng_ust_field_list *list); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_ust_abi_tracepoint_iter * lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) struct lttng_ust_abi_field_iter * lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_session *lttng_session_create(void); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) int lttng_session_enable(struct lttng_session *session); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) int lttng_session_disable(struct lttng_session *session); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) int lttng_session_statedump(struct lttng_session *session); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_session_destroy(struct lttng_session *session); -LTTNG_HIDDEN +/* + * Called with ust lock held. + */ +__attribute__((visibility("hidden"))) +int lttng_session_active(void); + +__attribute__((visibility("hidden"))) struct cds_list_head *lttng_get_sessions(void); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) void lttng_handle_pending_statedump(void *owner); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_channel *lttng_channel_create(struct lttng_session *session, const char *transport_name, void *buf_addr, @@ -522,41 +585,53 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session, uint64_t **memory_map_size, struct lttng_channel *chan_priv_init); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_channel_enable(struct lttng_channel *channel); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) int lttng_channel_disable(struct lttng_channel *channel); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) void lttng_transport_register(struct lttng_transport *transport); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_transport_unregister(struct lttng_transport *transport); -LTTNG_HIDDEN -void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc); +/* This is ABI between liblttng-ust and liblttng-ust-ctl */ +struct lttng_transport *lttng_ust_transport_find(const char *name); + +/* This is ABI between liblttng-ust and liblttng-ust-dl */ +void lttng_ust_dl_update(void *ip); + +__attribute__((visibility("hidden"))) +void lttng_probe_provider_unregister_events(struct lttng_ust_probe_desc *desc); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_fix_pending_events(void); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct cds_list_head *lttng_get_probe_list_head(void); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session, - const struct lttng_enum_desc *enum_desc); + const struct lttng_ust_enum_desc *enum_desc); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) int lttng_abi_create_root_handle(void); -LTTNG_HIDDEN +__attribute__((visibility("hidden"))) const struct lttng_ust_abi_objd_ops *lttng_ust_abi_objd_ops(int id); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) int lttng_ust_abi_objd_unref(int id, int is_owner); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_ust_abi_exit(void); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_ust_abi_events_exit(void); -LTTNG_HIDDEN + +__attribute__((visibility("hidden"))) void lttng_ust_abi_objd_table_owner_cleanup(void *owner); #endif /* _LTTNG_UST_EVENTS_INTERNAL_H */