X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=8839c1e8ae6cc906d73860ad25d9cde5b0273ad1;hb=d619fae9bcfb47b5fd147a3af6dc7c43e580d5e6;hp=fa151acfb15ad8f4a30bb206a09bee5e5a6fb962;hpb=546cb5f29a6b43d6240f21a1a2d1a38b2919f966;p=lttng-modules.git diff --git a/src/lttng-events.c b/src/lttng-events.c index fa151acf..8839c1e8 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -2222,6 +2222,41 @@ void lttng_create_event_if_missing(struct lttng_event_enabler_common *event_enab } } +static +void lttng_event_enabler_init_event_filter(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_event_common *event) +{ + /* Link filter bytecodes if not linked yet. */ + lttng_enabler_link_bytecode(event->priv->desc, lttng_static_ctx, + &event->priv->filter_bytecode_runtime_head, &event_enabler->filter_bytecode_head); +} + +static +void lttng_event_enabler_init_event_capture(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_event_common *event) +{ + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + break; + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + + /* Link capture bytecodes if not linked yet. */ + lttng_enabler_link_bytecode(event->priv->desc, + lttng_static_ctx, &event_notifier->priv->capture_bytecode_runtime_head, + &event_notifier_enabler->capture_bytecode_head); + event_notifier->priv->num_captures = event_notifier_enabler->num_captures; + break; + } + default: + WARN_ON_ONCE(1); + } +} + /* * Create events associated with an event_enabler (if not already present), * and add backward reference from the event to the enabler. @@ -2230,24 +2265,11 @@ void lttng_create_event_if_missing(struct lttng_event_enabler_common *event_enab static int lttng_event_enabler_ref_events(struct lttng_event_recorder_enabler *event_enabler) { - struct lttng_kernel_channel_buffer *chan = event_enabler->chan; struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler(event_enabler); struct lttng_kernel_event_recorder_private *event_recorder_priv; struct list_head *event_list_head = lttng_get_event_list_head_from_enabler(&event_enabler->parent); - if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL && - base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL && - base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME && - !strcmp(base_enabler->event_param.name, "*")) { - int enabled = base_enabler->enabled; - enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit; - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_entry, enabled); - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_exit, enabled); - } + lttng_syscall_table_set_wildcard_all(base_enabler); /* First ensure that probe events are created for this enabler. */ lttng_create_event_if_missing(&event_enabler->parent); @@ -2274,13 +2296,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_recorder_enabler *event_en &event_recorder_priv->parent.enablers_ref_head); } - /* - * Link filter bytecodes if not linked yet. - */ - lttng_enabler_link_bytecode(event_recorder_priv->parent.desc, - lttng_static_ctx, - &event_recorder_priv->parent.filter_bytecode_runtime_head, - <tng_event_recorder_enabler_as_enabler(event_enabler)->filter_bytecode_head); + lttng_event_enabler_init_event_filter(&event_enabler->parent, &event_recorder->parent); } return 0; } @@ -2292,26 +2308,10 @@ static int lttng_event_notifier_enabler_ref_event_notifiers( struct lttng_event_notifier_enabler *event_notifier_enabler) { - struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group; - struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); struct lttng_kernel_event_notifier_private *event_notifier_priv; struct list_head *event_list_head = lttng_get_event_list_head_from_enabler(&event_notifier_enabler->parent); - if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL && - base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL && - base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME && - !strcmp(base_enabler->event_param.name, "*")) { - - int enabled = base_enabler->enabled; - enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit; - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_entry, enabled); - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_exit, enabled); - - } + lttng_syscall_table_set_wildcard_all(&event_notifier_enabler->parent); /* First ensure that probe event_notifiers are created for this enabler. */ lttng_create_event_if_missing(&event_notifier_enabler->parent); @@ -2341,19 +2341,8 @@ int lttng_event_notifier_enabler_ref_event_notifiers( &event_notifier_priv->parent.enablers_ref_head); } - /* - * Link filter bytecodes if not linked yet. - */ - lttng_enabler_link_bytecode(event_notifier_priv->parent.desc, - lttng_static_ctx, &event_notifier_priv->parent.filter_bytecode_runtime_head, - <tng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head); - - /* Link capture bytecodes if not linked yet. */ - lttng_enabler_link_bytecode(event_notifier_priv->parent.desc, - lttng_static_ctx, &event_notifier_priv->capture_bytecode_runtime_head, - &event_notifier_enabler->capture_bytecode_head); - - event_notifier_priv->num_captures = event_notifier_enabler->num_captures; + lttng_event_enabler_init_event_filter(&event_notifier_enabler->parent, &event_notifier->parent); + lttng_event_enabler_init_event_capture(&event_notifier_enabler->parent, &event_notifier->parent); } return 0; }