From 1ae083ba1e1a1116fdc6119a01faa5320a4e2f2b Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 1 Nov 2021 13:59:48 -0400 Subject: [PATCH] Refactoring: rename lttng_event_enabler to lttng_event_recorder_enabler To clarify that event recorder is distinct from event notifier, rename "event enabler" to "event recorder enabler". Signed-off-by: Mathieu Desnoyers Change-Id: I968d2f7a4efc43dfa7f4a8bb62cc4f963af83b30 --- include/lttng/events-internal.h | 28 +++++++++--------- src/lttng-abi.c | 14 ++++----- src/lttng-events.c | 52 ++++++++++++++++----------------- src/lttng-syscalls.c | 30 +++++++++---------- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index 9b67b078..19e18815 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -239,7 +239,7 @@ struct lttng_event_enabler_common { uint64_t user_token; /* User-provided token. */ }; -struct lttng_event_enabler { +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. */ @@ -587,10 +587,10 @@ int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common * void *event_filter_ctx); static inline -struct lttng_event_enabler_common *lttng_event_enabler_as_enabler( - struct lttng_event_enabler *event_enabler) +struct lttng_event_enabler_common *lttng_event_recorder_enabler_as_enabler( + struct lttng_event_recorder_enabler *event_recorder_enabler) { - return &event_enabler->parent; + return &event_recorder_enabler->parent; } static inline @@ -779,16 +779,16 @@ int lttng_cpuhp_perf_counter_dead(unsigned int cpu, } #endif -struct lttng_event_enabler *lttng_event_enabler_create( +struct lttng_event_recorder_enabler *lttng_event_recorder_enabler_create( enum lttng_enabler_format_type format_type, struct lttng_kernel_abi_event *event_param, struct lttng_kernel_channel_buffer *chan); void lttng_event_enabler_session_add(struct lttng_kernel_session *session, - struct lttng_event_enabler *event_enabler); -void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler); + struct lttng_event_recorder_enabler *event_enabler); +void lttng_event_enabler_destroy(struct lttng_event_recorder_enabler *event_enabler); -int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler); -int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler); +int lttng_event_enabler_enable(struct lttng_event_recorder_enabler *event_enabler); +int lttng_event_enabler_disable(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, @@ -799,7 +799,7 @@ int lttng_event_notifier_enabler_enable( int lttng_event_notifier_enabler_disable( struct lttng_event_notifier_enabler *event_notifier_enabler); -int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler, +int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_recorder_enabler *event_enabler, struct lttng_kernel_abi_filter_bytecode __user *bytecode); int lttng_event_notifier_enabler_attach_filter_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, @@ -817,7 +817,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 *event_enabler); +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( @@ -839,7 +839,7 @@ int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifie int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier); #else static inline int lttng_syscalls_register_event( - struct lttng_event_enabler *event_enabler) + struct lttng_event_recorder_enabler *event_enabler) { return -ENOSYS; } @@ -1103,9 +1103,9 @@ 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_enabler *event_enabler, +struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, const struct lttng_kernel_event_desc *event_desc); -struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler, +struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *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, diff --git a/src/lttng-abi.c b/src/lttng-abi.c index 72dc0603..2fec4237 100644 --- a/src/lttng-abi.c +++ b/src/lttng-abi.c @@ -1887,17 +1887,17 @@ int lttng_abi_create_event(struct file *channel_file, lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: { - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; if (strutils_is_star_glob_pattern(event_param->name)) { /* * If the event name is a star globbing pattern, * we create the special star globbing enabler. */ - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB, + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB, event_param, channel); } else { - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, event_param, channel); } if (event_enabler) @@ -1913,9 +1913,9 @@ int lttng_abi_create_event(struct file *channel_file, case LTTNG_KERNEL_ABI_UPROBE: { struct lttng_kernel_event_recorder *event; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, event_param, channel); if (!event_enabler) { ret = -ENOMEM; @@ -2700,7 +2700,7 @@ long lttng_event_recorder_event_ioctl(struct file *file, unsigned int cmd, unsig static long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct lttng_event_enabler *event_enabler = file->private_data; + struct lttng_event_recorder_enabler *event_enabler = file->private_data; switch (cmd) { case LTTNG_KERNEL_ABI_OLD_CONTEXT: @@ -2743,7 +2743,7 @@ int lttng_event_recorder_event_release(struct inode *inode, struct file *file) static int lttng_event_recorder_enabler_release(struct inode *inode, struct file *file) { - struct lttng_event_enabler *event_enabler = file->private_data; + struct lttng_event_recorder_enabler *event_enabler = file->private_data; if (event_enabler) fput(event_enabler->chan->priv->parent.file); diff --git a/src/lttng-events.c b/src/lttng-events.c index e40c1db2..5bd357fc 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -354,7 +354,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session) struct lttng_kernel_channel_buffer_private *chan_priv, *tmpchan_priv; struct lttng_kernel_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv; struct lttng_metadata_stream *metadata_stream; - struct lttng_event_enabler *event_enabler, *tmp_event_enabler; + struct lttng_event_recorder_enabler *event_enabler, *tmp_event_enabler; int ret; mutex_lock(&sessions_mutex); @@ -859,7 +859,7 @@ void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream) * Supports event creation while tracing session is active. * Needs to be called with sessions mutex held. */ -struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler, +struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, const struct lttng_kernel_event_desc *event_desc) { struct lttng_kernel_channel_buffer *chan = event_enabler->chan; @@ -1395,7 +1395,7 @@ int lttng_kernel_counter_clear(struct lttng_counter *counter, return counter->ops->counter_clear(counter->counter, dim_indexes); } -struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler, +struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, const struct lttng_kernel_event_desc *event_desc) { struct lttng_kernel_event_recorder *event; @@ -2067,10 +2067,10 @@ int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, } static -int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler, +int lttng_event_enabler_match_event(struct lttng_event_recorder_enabler *event_enabler, struct lttng_kernel_event_recorder *event_recorder) { - struct lttng_event_enabler_common *base_enabler = lttng_event_enabler_as_enabler( + struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler( event_enabler); if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation) @@ -2114,7 +2114,7 @@ struct lttng_enabler_ref *lttng_enabler_ref( } static -void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_enabler) +void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { struct lttng_kernel_session *session = event_enabler->chan->parent.session; struct lttng_kernel_probe_desc *probe_desc; @@ -2137,7 +2137,7 @@ void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_ desc = probe_desc->event_desc[i]; if (!lttng_desc_match_enabler(desc, - lttng_event_enabler_as_enabler(event_enabler))) + lttng_event_recorder_enabler_as_enabler(event_enabler))) continue; /* @@ -2225,7 +2225,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi } static -void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_enabler) +void lttng_create_syscall_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { int ret; @@ -2250,7 +2250,7 @@ void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_ * Should be called with sessions mutex held. */ static -void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) +void lttng_create_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { switch (event_enabler->parent.event_param.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: @@ -2273,11 +2273,11 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) * Should be called with sessions mutex held. */ static -int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) +int lttng_event_enabler_ref_events(struct lttng_event_recorder_enabler *event_enabler) { struct lttng_kernel_channel_buffer *chan = event_enabler->chan; struct lttng_kernel_session *session = event_enabler->chan->parent.session; - struct lttng_event_enabler_common *base_enabler = lttng_event_enabler_as_enabler(event_enabler); + struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler(event_enabler); struct lttng_kernel_event_recorder_private *event_recorder_priv; if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL && @@ -2305,7 +2305,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) if (!lttng_event_enabler_match_event(event_enabler, event_recorder)) continue; enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head, - lttng_event_enabler_as_enabler(event_enabler)); + lttng_event_recorder_enabler_as_enabler(event_enabler)); if (!enabler_ref) { /* * If no backward ref, create it. @@ -2314,7 +2314,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL); if (!enabler_ref) return -ENOMEM; - enabler_ref->ref = lttng_event_enabler_as_enabler(event_enabler); + enabler_ref->ref = lttng_event_recorder_enabler_as_enabler(event_enabler); list_add(&enabler_ref->node, &event_recorder_priv->parent.enablers_ref_head); } @@ -2325,7 +2325,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) lttng_enabler_link_bytecode(event_recorder_priv->parent.desc, lttng_static_ctx, &event_recorder_priv->parent.filter_bytecode_runtime_head, - <tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head); + <tng_event_recorder_enabler_as_enabler(event_enabler)->filter_bytecode_head); } return 0; } @@ -2472,12 +2472,12 @@ int lttng_fix_pending_event_notifiers(void) return 0; } -struct lttng_event_enabler *lttng_event_enabler_create( +struct lttng_event_recorder_enabler *lttng_event_recorder_enabler_create( enum lttng_enabler_format_type format_type, struct lttng_kernel_abi_event *event_param, struct lttng_kernel_channel_buffer *chan) { - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL); if (!event_enabler) @@ -2494,7 +2494,7 @@ struct lttng_event_enabler *lttng_event_enabler_create( } void lttng_event_enabler_session_add(struct lttng_kernel_session *session, - struct lttng_event_enabler *event_enabler) + struct lttng_event_recorder_enabler *event_enabler) { mutex_lock(&sessions_mutex); list_add(&event_enabler->node, &session->priv->enablers_head); @@ -2503,19 +2503,19 @@ void lttng_event_enabler_session_add(struct lttng_kernel_session *session, mutex_unlock(&sessions_mutex); } -int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler) +int lttng_event_enabler_enable(struct lttng_event_recorder_enabler *event_enabler) { mutex_lock(&sessions_mutex); - lttng_event_enabler_as_enabler(event_enabler)->enabled = 1; + lttng_event_recorder_enabler_as_enabler(event_enabler)->enabled = 1; lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session); mutex_unlock(&sessions_mutex); return 0; } -int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler) +int lttng_event_enabler_disable(struct lttng_event_recorder_enabler *event_enabler) { mutex_lock(&sessions_mutex); - lttng_event_enabler_as_enabler(event_enabler)->enabled = 0; + lttng_event_recorder_enabler_as_enabler(event_enabler)->enabled = 0; lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session); mutex_unlock(&sessions_mutex); return 0; @@ -2554,12 +2554,12 @@ error_free: return ret; } -int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler, +int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_recorder_enabler *event_enabler, struct lttng_kernel_abi_filter_bytecode __user *bytecode) { int ret; ret = lttng_enabler_attach_filter_bytecode( - lttng_event_enabler_as_enabler(event_enabler), bytecode); + lttng_event_recorder_enabler_as_enabler(event_enabler), bytecode); if (ret) goto error; @@ -2594,9 +2594,9 @@ void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler) } } -void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler) +void lttng_event_enabler_destroy(struct lttng_event_recorder_enabler *event_enabler) { - lttng_enabler_destroy(lttng_event_enabler_as_enabler(event_enabler)); + lttng_enabler_destroy(lttng_event_recorder_enabler_as_enabler(event_enabler)); if (event_enabler->published) list_del(&event_enabler->node); @@ -2741,7 +2741,7 @@ void lttng_event_notifier_enabler_destroy( static void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) { - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; struct lttng_kernel_event_recorder_private *event_recorder_priv; list_for_each_entry(event_enabler, &session->priv->enablers_head, node) diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index fdc8524d..34dc138e 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -488,8 +488,8 @@ struct lttng_kernel_syscall_table *get_syscall_table_from_enabler(struct lttng_e switch (event_enabler->enabler_type) { case LTTNG_EVENT_ENABLER_TYPE_RECORDER: { - struct lttng_event_enabler *event_recorder_enabler = - container_of(event_enabler, struct lttng_event_enabler, parent); + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); return &event_recorder_enabler->chan->priv->parent.syscall_table; } case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: @@ -530,7 +530,7 @@ struct lttng_kernel_syscall_table *get_syscall_table_from_event(struct lttng_ker */ static int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *table, size_t table_len, - struct hlist_head *chan_table, struct lttng_event_enabler *syscall_event_enabler, + struct hlist_head *chan_table, struct lttng_event_recorder_enabler *syscall_event_enabler, enum sc_type type) { struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent); @@ -541,7 +541,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* Allocate events for each syscall matching enabler, insert into table */ for (i = 0; i < table_len; i++) { const struct lttng_kernel_event_desc *desc = table[i].desc; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; struct lttng_kernel_abi_event ev; struct lttng_kernel_event_recorder_private *event_recorder_priv; struct lttng_kernel_event_recorder *event_recorder; @@ -553,7 +553,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl continue; } if (lttng_desc_match_enabler(desc, - lttng_event_enabler_as_enabler(syscall_event_enabler)) <= 0) + lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)) <= 0) continue; /* * Check if already created. @@ -592,7 +592,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1); ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan); if (!event_enabler) { return -ENOMEM; } @@ -616,7 +616,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* * Should be called with sessions lock held. */ -int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enabler) +int lttng_syscalls_register_event(struct lttng_event_recorder_enabler *syscall_event_enabler) { struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent); struct lttng_kernel_abi_event ev; @@ -657,7 +657,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_entry_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -665,7 +665,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } @@ -682,7 +682,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -690,7 +690,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } @@ -707,7 +707,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -715,7 +715,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } @@ -732,7 +732,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_exit_unknown; struct lttng_kernel_event_recorder *event_recorder; - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); @@ -740,7 +740,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *syscall_event_enab ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; - event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); + event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan); if (!event_enabler) { return -ENOMEM; } -- 2.34.1