X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents-internal.h;h=181b7b4552305456c16eb8662e76bdbf4dff0a7c;hb=1158b2706e58c2f94e6bd746e0504b989320c0a1;hp=3c741e66171ff3291f0835204c798ba46c2c4c8e;hpb=19bef247a29761d0f9ecca993e7088b46456f199;p=lttng-modules.git diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index 3c741e66..181b7b45 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -9,6 +9,7 @@ #define _LTTNG_EVENTS_INTERNAL_H #include +#include #include @@ -79,6 +80,7 @@ struct lttng_kernel_event_common_private { struct list_head filter_bytecode_runtime_head; struct hlist_node hlist_node; /* node in events hash table */ + struct list_head node; /* node in event list */ enum lttng_kernel_abi_instrumentation instrumentation; /* Selected by instrumentation */ @@ -102,7 +104,6 @@ struct lttng_kernel_event_recorder_private { struct lttng_kernel_event_common_private parent; struct lttng_kernel_event_recorder *pub; /* Public event interface */ - struct list_head node; /* Event recorder list */ struct lttng_kernel_ctx *ctx; unsigned int id; unsigned int metadata_dumped:1; @@ -115,7 +116,6 @@ struct lttng_kernel_event_notifier_private { struct lttng_event_notifier_group *group; /* weak ref */ size_t num_captures; /* Needed to allocate the msgpack array. */ uint64_t error_counter_index; - struct list_head node; /* Event notifier list */ struct list_head capture_bytecode_runtime_head; }; @@ -237,20 +237,19 @@ struct lttng_event_enabler_common { unsigned int enabled:1; uint64_t user_token; /* User-provided token. */ + + struct list_head node; /* list of enablers */ + bool published; /* published in list. */ }; struct lttng_event_recorder_enabler { struct lttng_event_enabler_common parent; - struct list_head node; /* per-session list of enablers */ - bool published; /* published in per-session list. */ struct lttng_kernel_channel_buffer *chan; }; 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 */ @@ -311,7 +310,7 @@ struct lttng_metadata_cache { atomic_t producing; /* Metadata being produced (incomplete) */ struct kref refcount; /* Metadata cache usage */ struct list_head metadata_stream; /* Metadata stream list */ - uuid_le uuid; /* Trace session unique ID (copy) */ + guid_t uuid; /* Trace session unique ID (copy) */ struct mutex lock; /* Produce/consume lock */ uint64_t version; /* Current version of the metadata */ }; @@ -461,7 +460,7 @@ struct lttng_kernel_session_private { struct list_head events; /* Event list head */ struct list_head list; /* Session list */ unsigned int free_chan_id; /* Next chan ID to allocate */ - uuid_le uuid; /* Trace session unique ID */ + guid_t uuid; /* Trace session unique ID */ struct lttng_metadata_cache *metadata_cache; unsigned int metadata_dumped:1, tstate:1; /* Transient enable state */ @@ -594,6 +593,48 @@ 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; + } +} + +static inline +struct list_head *lttng_get_event_list_head_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; + } + 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->event_notifiers_head; + } + default: + return NULL; + } +} + int lttng_context_init(void); void lttng_context_exit(void); int lttng_kernel_context_append(struct lttng_kernel_ctx **ctx_p, @@ -608,6 +649,7 @@ int lttng_add_pid_to_ctx(struct lttng_kernel_ctx **ctx); int lttng_add_cpu_id_to_ctx(struct lttng_kernel_ctx **ctx); int lttng_add_procname_to_ctx(struct lttng_kernel_ctx **ctx); int lttng_add_prio_to_ctx(struct lttng_kernel_ctx **ctx); +int wrapper_task_prio_init(void); int lttng_add_nice_to_ctx(struct lttng_kernel_ctx **ctx); int lttng_add_vpid_to_ctx(struct lttng_kernel_ctx **ctx); int lttng_add_tid_to_ctx(struct lttng_kernel_ctx **ctx); @@ -796,8 +838,16 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common struct lttng_kernel_abi_filter_bytecode __user *bytecode); void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler); -int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, +bool 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); +bool lttng_event_enabler_event_name_match_event(struct lttng_event_enabler_common *event_enabler, + const char *event_name, + struct lttng_kernel_event_common *event); void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_desc, struct lttng_kernel_ctx *ctx, @@ -805,7 +855,7 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des struct list_head *enabler_bytecode_runtime_head); #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS) -int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler); +int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *event_enabler); int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event); int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event); @@ -814,8 +864,10 @@ int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *sysc long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table, struct lttng_kernel_abi_syscall_mask __user *usyscall_mask); + +void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler); #else -static inline int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler) +static inline int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *event_enabler) { return -ENOSYS; } @@ -851,6 +903,9 @@ static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_ev return -ENOSYS; } +static inline void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler) +{ +} #endif #ifdef CONFIG_KPROBES @@ -1010,18 +1065,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(struct lttng_event_notifier_enabler *event_enabler, - const struct lttng_kernel_event_desc *event_notifier_desc); -struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler, - const struct lttng_kernel_event_desc *event_notifier_desc); int lttng_channel_enable(struct lttng_kernel_channel_common *channel); int lttng_channel_disable(struct lttng_kernel_channel_common *channel);