X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fevents-internal.h;h=30f56e150b7355f94d36697a7a2e869a4a4b324e;hb=1bbb5b2dfb4634c1ed19d006a538101fd69a30de;hp=b9f0a4148ac288d1b230c5d077722901d8f188cf;hpb=f2db8be348380b48e3795d14e49cc585b3c357fd;p=lttng-modules.git diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index b9f0a414..30f56e15 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -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 */ @@ -787,9 +781,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); @@ -809,73 +805,48 @@ 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_recorder_enabler *event_enabler); -int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan); -int lttng_syscalls_destroy_event(struct lttng_kernel_channel_buffer *chan); -int lttng_syscall_filter_enable_event_recorder(struct lttng_kernel_event_recorder *event_recorder); -int lttng_syscall_filter_disable_event_recorder(struct lttng_kernel_event_recorder *event_recorder); +int lttng_syscalls_register_event(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); -long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel, - struct lttng_kernel_abi_syscall_mask __user *usyscall_mask); +int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table); +int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table); -int lttng_syscalls_register_event_notifier( - struct lttng_event_notifier_enabler *event_notifier_enabler); -int lttng_syscalls_create_matching_event_notifiers( - struct lttng_event_notifier_enabler *event_notifier_enabler); -int lttng_syscalls_unregister_event_notifier_group(struct lttng_event_notifier_group *group); -int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier); -int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier); +long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table, + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask); #else -static inline int lttng_syscalls_register_event( - struct lttng_event_recorder_enabler *event_enabler) +static inline int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler) { return -ENOSYS; } -static inline int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan) -{ - return 0; -} - -static inline int lttng_syscalls_destroy(struct lttng_kernel_channel_buffer *chan) -{ - return 0; -} - -static inline int lttng_syscall_filter_enable_event_recorder(struct lttng_kernel_event_recorder *event_recorder) +static inline int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event) { return -ENOSYS; } -static inline int lttng_syscall_filter_disable_event_recorder(struct lttng_kernel_event_recorder *event_recorder) +static inline int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event) { return -ENOSYS; } -static inline long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel, - struct lttng_kernel_syscall_mask __user *usyscall_mask) +static inline int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { - return -ENOSYS; -} - -static inline int lttng_syscalls_register_event_notifier( - struct lttng_event_notifier_group *group) -{ - return -ENOSYS; + return 0; } -static inline int lttng_syscalls_unregister_event_notifier_group( - struct lttng_event_notifier_group *group) +static inline int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { return 0; } -static inline int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier) +static inline long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table, + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask) { return -ENOSYS; } -static inline int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier) +static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_notifier_enabler *event_notifier_enabler) { return -ENOSYS; } @@ -887,52 +858,27 @@ int lttng_kprobes_register_event(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_kernel_event_recorder *event); -void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event); -void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event); -int lttng_kprobes_register_event_notifier(const char *symbol_name, - uint64_t offset, - uint64_t addr, - struct lttng_kernel_event_notifier *event_notifier); -void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier); -void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier); + struct lttng_kernel_event_common *event); +void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event); +void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event); #else static inline int lttng_kprobes_register_event(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_kernel_event_recorder *event) + struct lttng_kernel_event_common *event) { return -ENOSYS; } static inline -void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event) -{ -} - -static inline -void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event) -{ -} - -static inline -int lttng_kprobes_register_event_notifier(const char *symbol_name, - uint64_t offset, - uint64_t addr, - struct lttng_kernel_event_notifier *event_notifier) +void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event) { - return -ENOSYS; } static inline -void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier) -{ -} - -static inline -void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier) +void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event) { } #endif @@ -942,19 +888,15 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event, #ifdef CONFIG_UPROBES int lttng_uprobes_register_event(const char *name, - int fd, struct lttng_kernel_event_recorder *event); + int fd, struct lttng_kernel_event_common *event); int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event, struct lttng_kernel_abi_event_callsite __user *callsite); -void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event); -void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event); -int lttng_uprobes_register_event_notifier(const char *name, - int fd, struct lttng_kernel_event_notifier *event_notifier); -void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier); -void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier); +void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event); +void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event); #else static inline int lttng_uprobes_register_event(const char *name, - int fd, struct lttng_kernel_event_recorder *event) + int fd, struct lttng_kernel_event_common *event) { return -ENOSYS; } @@ -967,29 +909,12 @@ int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event, } static inline -void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event) -{ -} - -static inline -void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event) +void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event) { } static inline -int lttng_uprobes_register_event_notifier(const char *name, - int fd, struct lttng_kernel_event_notifier *event_notifier) -{ - return -ENOSYS; -} - -static inline -void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier) -{ -} - -static inline -void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier) +void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event) { } #endif @@ -999,10 +924,10 @@ int lttng_kretprobes_register(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_kernel_event_recorder *event_entry, - struct lttng_kernel_event_recorder *event_exit); -void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event); -void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event); + struct lttng_kernel_event_common *event_entry, + struct lttng_kernel_event_common *event_exit); +void lttng_kretprobes_unregister(struct lttng_kernel_event_common *event); +void lttng_kretprobes_destroy_private(struct lttng_kernel_event_common *event); int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event, int enable); #else @@ -1011,19 +936,19 @@ int lttng_kretprobes_register(const char *name, const char *symbol_name, uint64_t offset, uint64_t addr, - struct lttng_kernel_event_recorder *event_entry, - struct lttng_kernel_event_recorder *event_exit) + struct lttng_kernel_event_common *event_entry, + struct lttng_kernel_event_common *event_exit) { return -ENOSYS; } static inline -void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event) +void lttng_kretprobes_unregister(struct lttng_kernel_event_common *event) { } static inline -void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event) +void lttng_kretprobes_destroy_private(struct lttng_kernel_event_common *event) { } @@ -1071,7 +996,7 @@ int lttng_event_notifier_group_create_error_counter( void lttng_event_notifier_group_destroy( struct lttng_event_notifier_group *event_notifier_group); -struct lttng_kernel_channel_buffer *lttng_channel_create(struct lttng_kernel_session *session, +struct lttng_kernel_channel_buffer *lttng_channel_buffer_create(struct lttng_kernel_session *session, const char *transport_name, void *buf_addr, size_t subbuf_size, size_t num_subbuf, @@ -1093,23 +1018,13 @@ struct lttng_kernel_event_recorder *lttng_event_compat_old_create(struct lttng_k 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_buffer *channel); -int lttng_channel_disable(struct lttng_kernel_channel_buffer *channel); +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); int lttng_event_enable(struct lttng_kernel_event_common *event); int lttng_event_disable(struct lttng_kernel_event_common *event);