X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fevents-internal.h;h=ee2a4ff26bd0c970bbd4d9a8e5e07a6f1ac566b9;hb=adfdce76604f5324d88fd888fa5236a3bacf056f;hp=35ed887930b9f8fa9d3f358832e6cd148eccfe3d;hpb=0fab709d24a9c6195e31414e00c95e74d8d807c5;p=lttng-modules.git diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index 35ed8879..ee2a4ff2 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -77,6 +77,9 @@ struct lttng_kernel_event_common_private { int has_enablers_without_filter_bytecode; /* list of struct lttng_kernel_bytecode_runtime, sorted by seqnum */ struct list_head filter_bytecode_runtime_head; + + struct hlist_node hlist_node; /* node in events hash table */ + enum lttng_kernel_abi_instrumentation instrumentation; /* Selected by instrumentation */ union { @@ -100,7 +103,6 @@ struct lttng_kernel_event_recorder_private { struct lttng_kernel_event_recorder *pub; /* Public event interface */ struct list_head node; /* Event recorder list */ - struct hlist_node hlist; /* Hash table of event recorders */ struct lttng_kernel_ctx *ctx; unsigned int id; unsigned int metadata_dumped:1; @@ -114,9 +116,7 @@ struct lttng_kernel_event_notifier_private { size_t num_captures; /* Needed to allocate the msgpack array. */ uint64_t error_counter_index; struct list_head node; /* Event notifier list */ - struct hlist_node hlist; /* Hash table of event notifiers */ struct list_head capture_bytecode_runtime_head; - }; struct lttng_kernel_syscall_table { @@ -250,6 +250,7 @@ struct lttng_event_notifier_enabler { struct lttng_event_enabler_common parent; uint64_t error_counter_index; struct list_head node; /* List of event_notifier enablers */ + bool published; /* published in group list. */ struct lttng_event_notifier_group *group; /* head list of struct lttng_kernel_bytecode_node */ @@ -410,11 +411,11 @@ struct lttng_counter { struct lttng_counter_ops *ops; }; -#define LTTNG_EVENT_NOTIFIER_HT_BITS 12 -#define LTTNG_EVENT_NOTIFIER_HT_SIZE (1U << LTTNG_EVENT_NOTIFIER_HT_BITS) +#define LTTNG_EVENT_HT_BITS 12 +#define LTTNG_EVENT_HT_SIZE (1U << LTTNG_EVENT_HT_BITS) -struct lttng_event_notifier_ht { - struct hlist_head table[LTTNG_EVENT_NOTIFIER_HT_SIZE]; +struct lttng_event_ht { + struct hlist_head table[LTTNG_EVENT_HT_SIZE]; }; struct lttng_event_notifier_group { @@ -423,7 +424,7 @@ struct lttng_event_notifier_group { struct list_head node; /* event notifier group list */ struct list_head enablers_head; /* List of enablers */ struct list_head event_notifiers_head; /* List of event notifier */ - struct lttng_event_notifier_ht event_notifiers_ht; /* Hash table of event notifiers */ + struct lttng_event_ht events_ht; /* Hash table of event notifiers */ struct lttng_kernel_channel_buffer_ops *ops; struct lttng_transport *transport; struct lttng_kernel_ring_buffer_channel *chan; /* Ring buffer channel for event notifier group. */ @@ -451,13 +452,6 @@ struct lttng_counter_transport { struct lttng_counter_ops ops; }; -#define LTTNG_EVENT_HT_BITS 12 -#define LTTNG_EVENT_HT_SIZE (1U << LTTNG_EVENT_HT_BITS) - -struct lttng_event_ht { - struct hlist_head table[LTTNG_EVENT_HT_SIZE]; -}; - struct lttng_kernel_session_private { struct lttng_kernel_session *pub; /* Public session interface */ @@ -600,6 +594,27 @@ struct lttng_event_enabler_common *lttng_event_notifier_enabler_as_enabler( return &event_notifier_enabler->parent; } +static inline +struct lttng_event_ht *lttng_get_event_ht_from_enabler(struct lttng_event_enabler_common *event_enabler) +{ + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + return &event_recorder_enabler->chan->parent.session->priv->events_ht; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + return &event_notifier_enabler->group->events_ht; + } + default: + return NULL; + } +} + int lttng_context_init(void); void lttng_context_exit(void); int lttng_kernel_context_append(struct lttng_kernel_ctx **ctx_p, @@ -787,9 +802,11 @@ void lttng_event_enabler_session_add(struct lttng_kernel_session *session, struct lttng_event_recorder_enabler *event_enabler); 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, - struct lttng_kernel_abi_event_notifier *event_notifier_param); + struct lttng_kernel_abi_event_notifier *event_notifier_param, + struct lttng_event_notifier_group *event_notifier_group); +void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *event_notifier_group, + struct lttng_event_notifier_enabler *event_notifier_enabler); int lttng_event_notifier_enabler_attach_capture_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_abi_capture_bytecode __user *bytecode); @@ -802,6 +819,11 @@ void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enable int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, struct lttng_event_enabler_common *enabler); +bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_event_common *event); +bool lttng_event_enabler_desc_match_event(struct lttng_event_enabler_common *event_enabler, + const struct lttng_kernel_event_desc *desc, + struct lttng_kernel_event_common *event); void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_desc, struct lttng_kernel_ctx *ctx, @@ -1014,28 +1036,10 @@ struct lttng_kernel_channel_buffer *lttng_global_channel_create(struct lttng_ker unsigned int read_timer_interval); void lttng_metadata_channel_destroy(struct lttng_kernel_channel_buffer *chan); -struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, +struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler, const struct lttng_kernel_event_desc *event_desc); -struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, +struct lttng_kernel_event_common *lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler, const struct lttng_kernel_event_desc *event_desc); -struct lttng_kernel_event_recorder *lttng_event_compat_old_create(struct lttng_kernel_channel_buffer *chan, - struct lttng_kernel_abi_old_event *old_event_param, - const struct lttng_kernel_event_desc *internal_desc); - -struct lttng_kernel_event_notifier *lttng_event_notifier_create( - const struct lttng_kernel_event_desc *event_notifier_desc, - uint64_t id, - uint64_t error_counter_idx, - struct lttng_event_notifier_group *event_notifier_group, - struct lttng_kernel_abi_event_notifier *event_notifier_param, - enum lttng_kernel_abi_instrumentation itype); -struct lttng_kernel_event_notifier *_lttng_event_notifier_create( - const struct lttng_kernel_event_desc *event_notifier_desc, - uint64_t id, - uint64_t error_counter_idx, - struct lttng_event_notifier_group *event_notifier_group, - struct lttng_kernel_abi_event_notifier *event_notifier_param, - enum lttng_kernel_abi_instrumentation itype); int lttng_channel_enable(struct lttng_kernel_channel_common *channel); int lttng_channel_disable(struct lttng_kernel_channel_common *channel);