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_recorder_enabler *event_recorder_enabler, *tmp_event_recorder_enabler;
+ struct lttng_event_enabler_common *event_enabler, *tmp_event_enabler;
int ret;
mutex_lock(&sessions_mutex);
ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
- list_for_each_entry_safe(event_recorder_enabler, tmp_event_recorder_enabler,
- &session->priv->enablers_head, node)
- lttng_event_enabler_destroy(&event_recorder_enabler->parent);
+ list_for_each_entry_safe(event_enabler, tmp_event_enabler, &session->priv->enablers_head, node)
+ lttng_event_enabler_destroy(event_enabler);
list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, parent.node)
_lttng_event_destroy(&event_recorder_priv->pub->parent);
list_for_each_entry_safe(chan_priv, tmpchan_priv, &session->priv->chan, node) {
void lttng_event_notifier_group_destroy(
struct lttng_event_notifier_group *event_notifier_group)
{
- struct lttng_event_notifier_enabler *event_notifier_enabler, *tmp_event_notifier_enabler;
+ struct lttng_event_enabler_common *event_enabler, *tmp_event_enabler;
struct lttng_kernel_event_notifier_private *event_notifier_priv, *tmpevent_notifier_priv;
int ret;
ret = lttng_syscalls_destroy_syscall_table(&event_notifier_group->syscall_table);
WARN_ON(ret);
- list_for_each_entry_safe(event_notifier_enabler, tmp_event_notifier_enabler,
+ list_for_each_entry_safe(event_enabler, tmp_event_enabler,
&event_notifier_group->enablers_head, node)
- lttng_event_enabler_destroy(&event_notifier_enabler->parent);
+ lttng_event_enabler_destroy(event_enabler);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
&event_notifier_group->event_notifiers_head, parent.node)
wake_up_interruptible(&stream->read_wait);
}
+static
+struct lttng_kernel_event_common *lttng_kernel_event_alloc(struct lttng_event_enabler_common *event_enabler)
+{
+ struct lttng_kernel_abi_event *event_param = &event_enabler->event_param;
+ enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
+
+ 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);
+ struct lttng_kernel_event_recorder *event_recorder;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
+ struct lttng_kernel_channel_buffer *chan = event_recorder_enabler->chan;
+
+ event_recorder = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL);
+ if (!event_recorder)
+ return NULL;
+ event_recorder_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL);
+ if (!event_recorder_priv) {
+ kmem_cache_free(event_recorder_private_cache, event_recorder);
+ return NULL;
+ }
+ event_recorder_priv->pub = event_recorder;
+ event_recorder_priv->parent.pub = &event_recorder->parent;
+ event_recorder->priv = event_recorder_priv;
+ event_recorder->parent.priv = &event_recorder_priv->parent;
+
+ event_recorder->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
+ event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter;
+ event_recorder->priv->parent.instrumentation = itype;
+ INIT_LIST_HEAD(&event_recorder->priv->parent.filter_bytecode_runtime_head);
+ INIT_LIST_HEAD(&event_recorder->priv->parent.enablers_ref_head);
+
+ event_recorder->chan = chan;
+ event_recorder->priv->id = chan->priv->free_event_id++;
+ return &event_recorder->parent;
+ }
+ 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;
+ struct lttng_kernel_event_notifier_private *event_notifier_priv;
+
+ event_notifier = kmem_cache_zalloc(event_notifier_cache, GFP_KERNEL);
+ if (!event_notifier)
+ return NULL;
+ event_notifier_priv = kmem_cache_zalloc(event_notifier_private_cache, GFP_KERNEL);
+ if (!event_notifier_priv) {
+ kmem_cache_free(event_notifier_private_cache, event_notifier);
+ return NULL;
+ }
+ event_notifier_priv->pub = event_notifier;
+ event_notifier_priv->parent.pub = &event_notifier->parent;
+ event_notifier->priv = event_notifier_priv;
+ event_notifier->parent.priv = &event_notifier_priv->parent;
+
+ event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER;
+ event_notifier->parent.run_filter = lttng_kernel_interpret_event_filter;
+ event_notifier->priv->parent.instrumentation = itype;
+ event_notifier->priv->parent.user_token = event_enabler->user_token;
+ INIT_LIST_HEAD(&event_notifier->priv->parent.filter_bytecode_runtime_head);
+ INIT_LIST_HEAD(&event_notifier->priv->parent.enablers_ref_head);
+
+ event_notifier->priv->group = event_notifier_enabler->group;
+ event_notifier->priv->error_counter_index = event_notifier_enabler->error_counter_index;
+ event_notifier->priv->num_captures = 0;
+ event_notifier->notification_send = lttng_event_notifier_notification_send;
+ INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head);
+ return &event_notifier->parent;
+ }
+ default:
+ return NULL;
+ }
+}
+
+static
+void lttng_kernel_event_free(struct lttng_kernel_event_common *event)
+{
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ kmem_cache_free(event_recorder_private_cache, event_recorder->priv);
+ kmem_cache_free(event_recorder_cache, event_recorder);
+ break;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+
+ kmem_cache_free(event_notifier_private_cache, event_notifier->priv);
+ kmem_cache_free(event_notifier_cache, event_notifier);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ }
+}
/*
* Supports event creation while tracing session is active.
struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
- struct lttng_kernel_event_recorder *event_recorder;
- struct lttng_kernel_event_recorder_private *event_recorder_priv;
struct lttng_kernel_event_common_private *event_priv;
+ struct lttng_kernel_event_common *event;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
+ struct lttng_kernel_event_recorder *event_recorder;
const char *event_name;
struct hlist_head *head;
int ret;
}
}
- event_recorder = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL);
- if (!event_recorder) {
- ret = -ENOMEM;
- goto cache_error;
- }
- event_recorder_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL);
- if (!event_recorder_priv) {
+ event = lttng_kernel_event_alloc(&event_enabler->parent);
+ if (!event) {
ret = -ENOMEM;
- goto cache_private_error;
+ goto alloc_error;
}
- event_recorder_priv->pub = event_recorder;
- event_recorder_priv->parent.pub = &event_recorder->parent;
- event_recorder->priv = event_recorder_priv;
- event_recorder->parent.priv = &event_recorder_priv->parent;
- event_recorder->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
-
- event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter;
- event_recorder->chan = chan;
- event_recorder->priv->id = chan->priv->free_event_id++;
- event_recorder->priv->parent.instrumentation = itype;
- INIT_LIST_HEAD(&event_recorder->priv->parent.filter_bytecode_runtime_head);
- INIT_LIST_HEAD(&event_recorder->priv->parent.enablers_ref_head);
+ event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent);
switch (itype) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
/* Event will be enabled by enabler sync. */
- event_recorder->parent.enabled = 0;
- event_recorder->priv->parent.registered = 0;
- event_recorder->priv->parent.desc = lttng_event_desc_get(event_name);
- if (!event_recorder->priv->parent.desc) {
+ event->enabled = 0;
+ event->priv->registered = 0;
+ event->priv->desc = lttng_event_desc_get(event_name);
+ if (!event->priv->desc) {
ret = -ENOENT;
goto register_error;
}
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_recorder->parent.enabled = 0;
- event_recorder->priv->parent.registered = 1;
+ event->enabled = 0;
+ event->priv->registered = 1;
/*
* Populate lttng_event structure before event
* registration.
event_param->u.kprobe.symbol_name,
event_param->u.kprobe.offset,
event_param->u.kprobe.addr,
- &event_recorder->parent);
+ event);
if (ret) {
ret = -EINVAL;
goto register_error;
}
- ret = try_module_get(event_recorder->priv->parent.desc->owner);
+ ret = try_module_get(event->priv->desc->owner);
WARN_ON_ONCE(!ret);
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
{
+ struct lttng_kernel_event_common *event_return;
struct lttng_kernel_event_recorder *event_recorder_return;
- struct lttng_kernel_event_recorder_private *event_recorder_return_priv;
/* kretprobe defines 2 events */
/*
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_recorder->parent.enabled = 0;
- event_recorder->priv->parent.registered = 1;
+ event->enabled = 0;
+ event->priv->registered = 1;
- event_recorder_return = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL);
- if (!event_recorder_return) {
- ret = -ENOMEM;
- goto register_error;
- }
- event_recorder_return_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL);
- if (!event_recorder_return_priv) {
- kmem_cache_free(event_recorder_cache, event_recorder_return);
+ event_return = lttng_kernel_event_alloc(&event_enabler->parent);
+ if (!event) {
ret = -ENOMEM;
- goto register_error;
+ goto alloc_error;
}
- event_recorder_return_priv->pub = event_recorder_return;
- event_recorder_return_priv->parent.pub = &event_recorder_return->parent;
- event_recorder_return->priv = event_recorder_return_priv;
- event_recorder_return->parent.priv = &event_recorder_return_priv->parent;
- event_recorder_return->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
-
- event_recorder_return->parent.run_filter = lttng_kernel_interpret_event_filter;
- event_recorder_return->chan = chan;
- event_recorder_return->priv->id = chan->priv->free_event_id++;
- event_recorder_return->priv->parent.instrumentation = itype;
- event_recorder_return->parent.enabled = 0;
- event_recorder_return->priv->parent.registered = 1;
- INIT_LIST_HEAD(&event_recorder_return->priv->parent.filter_bytecode_runtime_head);
- INIT_LIST_HEAD(&event_recorder_return->priv->parent.enablers_ref_head);
+ event_recorder_return = container_of(event_return, struct lttng_kernel_event_recorder, parent);
+
+ event_return->enabled = 0;
+ event_return->priv->registered = 1;
+
/*
* Populate lttng_event structure before kretprobe registration.
*/
event_param->u.kretprobe.symbol_name,
event_param->u.kretprobe.offset,
event_param->u.kretprobe.addr,
- &event_recorder->parent, &event_recorder_return->parent);
+ event, event_return);
if (ret) {
- kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv);
- kmem_cache_free(event_recorder_cache, event_recorder_return);
+ lttng_kernel_event_free(event_return);
ret = -EINVAL;
goto register_error;
}
/* Take 2 refs on the module: one per event. */
- ret = try_module_get(event_recorder->priv->parent.desc->owner);
+ ret = try_module_get(event->priv->desc->owner);
WARN_ON_ONCE(!ret);
- ret = try_module_get(event_recorder_return->priv->parent.desc->owner);
+ ret = try_module_get(event_return->priv->desc->owner);
WARN_ON_ONCE(!ret);
- ret = _lttng_event_metadata_statedump(chan->parent.session, chan,
- event_recorder_return);
+ ret = _lttng_event_metadata_statedump(chan->parent.session, chan, event_recorder_return);
WARN_ON_ONCE(ret > 0);
if (ret) {
- kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv);
- kmem_cache_free(event_recorder_cache, event_recorder_return);
- module_put(event_recorder_return->priv->parent.desc->owner);
- module_put(event_recorder->priv->parent.desc->owner);
+ lttng_kernel_event_free(event_return);
+ module_put(event_return->priv->desc->owner);
+ module_put(event->priv->desc->owner);
goto statedump_error;
}
- list_add(&event_recorder_return->priv->parent.node, &chan->parent.session->priv->events);
+ list_add(&event_return->priv->node, &chan->parent.session->priv->events);
break;
}
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_recorder->parent.enabled = 0;
- event_recorder->priv->parent.registered = 0;
- event_recorder->priv->parent.desc = event_desc;
+ event->enabled = 0;
+ event->priv->registered = 0;
+ event->priv->desc = event_desc;
switch (event_param->u.syscall.entryexit) {
case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
ret = -EINVAL;
goto register_error;
case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
- event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
+ event->priv->u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
break;
case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
- event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
+ event->priv->u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
break;
}
switch (event_param->u.syscall.abi) {
ret = -EINVAL;
goto register_error;
case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE:
- event_recorder->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
+ event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
break;
case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT:
- event_recorder->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
+ event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
break;
}
- if (!event_recorder->priv->parent.desc) {
+ if (!event->priv->desc) {
ret = -EINVAL;
goto register_error;
}
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_recorder->parent.enabled = 0;
- event_recorder->priv->parent.registered = 1;
+ event->enabled = 0;
+ event->priv->registered = 1;
/*
* Populate lttng_event structure before event
ret = lttng_uprobes_register_event(event_param->name,
event_param->u.uprobe.fd,
- &event_recorder->parent);
+ event);
if (ret)
goto register_error;
- ret = try_module_get(event_recorder->priv->parent.desc->owner);
+ ret = try_module_get(event->priv->desc->owner);
WARN_ON_ONCE(!ret);
break;
if (ret) {
goto statedump_error;
}
- hlist_add_head(&event_recorder->priv->parent.hlist_node, head);
- list_add(&event_recorder->priv->parent.node, &chan->parent.session->priv->events);
+ hlist_add_head(&event->priv->hlist_node, head);
+ list_add(&event->priv->node, &chan->parent.session->priv->events);
return event_recorder;
statedump_error:
/* If a statedump error occurs, events will not be readable. */
register_error:
- kmem_cache_free(event_recorder_private_cache, event_recorder_priv);
-cache_private_error:
- kmem_cache_free(event_recorder_cache, event_recorder);
-cache_error:
+ lttng_kernel_event_free(event);
+alloc_error:
exist:
type_error:
full:
struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
uint64_t token = event_enabler->parent.user_token;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
- struct lttng_kernel_event_notifier *event_notifier;
- struct lttng_kernel_event_notifier_private *event_notifier_priv;
struct lttng_kernel_event_common_private *event_priv;
+ struct lttng_kernel_event_common *event;
+ struct lttng_kernel_event_notifier_private *event_notifier_priv;
+ struct lttng_kernel_event_notifier *event_notifier;
struct lttng_counter *error_counter;
const char *event_name;
struct hlist_head *head;
}
}
- event_notifier = kmem_cache_zalloc(event_notifier_cache, GFP_KERNEL);
- if (!event_notifier) {
+ event = lttng_kernel_event_alloc(&event_enabler->parent);
+ if (!event) {
ret = -ENOMEM;
- goto cache_error;
+ goto alloc_error;
}
- event_notifier_priv = kmem_cache_zalloc(event_notifier_private_cache, GFP_KERNEL);
- if (!event_notifier_priv) {
- ret = -ENOMEM;
- goto cache_private_error;
- }
- event_notifier_priv->pub = event_notifier;
- event_notifier_priv->parent.pub = &event_notifier->parent;
- event_notifier->priv = event_notifier_priv;
- event_notifier->parent.priv = &event_notifier_priv->parent;
- event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER;
-
- event_notifier->priv->group = event_notifier_group;
- event_notifier->priv->parent.user_token = event_enabler->parent.user_token;
- event_notifier->priv->error_counter_index = event_enabler->error_counter_index;
- event_notifier->priv->num_captures = 0;
- event_notifier->priv->parent.instrumentation = itype;
- event_notifier->notification_send = lttng_event_notifier_notification_send;
- INIT_LIST_HEAD(&event_notifier->priv->parent.filter_bytecode_runtime_head);
- INIT_LIST_HEAD(&event_notifier->priv->parent.enablers_ref_head);
- INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head);
- event_notifier->parent.run_filter = lttng_kernel_interpret_event_filter;
+ event_notifier = container_of(event, struct lttng_kernel_event_notifier, parent);
switch (itype) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
/* Event will be enabled by enabler sync. */
- event_notifier->parent.enabled = 0;
- event_notifier->priv->parent.registered = 0;
- event_notifier->priv->parent.desc = lttng_event_desc_get(event_name);
- if (!event_notifier->priv->parent.desc) {
+ event->enabled = 0;
+ event->priv->registered = 0;
+ event->priv->desc = lttng_event_desc_get(event_name);
+ if (!event->priv->desc) {
ret = -ENOENT;
goto register_error;
}
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_notifier->parent.enabled = 0;
- event_notifier->priv->parent.registered = 1;
+ event->enabled = 0;
+ event->priv->registered = 1;
/*
* Populate lttng_event_notifier structure before event
* registration.
event_param->u.kprobe.symbol_name,
event_param->u.kprobe.offset,
event_param->u.kprobe.addr,
- &event_notifier->parent);
+ event);
if (ret) {
ret = -EINVAL;
goto register_error;
}
- ret = try_module_get(event_notifier->priv->parent.desc->owner);
+ ret = try_module_get(event->priv->desc->owner);
WARN_ON_ONCE(!ret);
break;
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_notifier->parent.enabled = 0;
- event_notifier->priv->parent.registered = 0;
- event_notifier->priv->parent.desc = event_desc;
+ event->enabled = 0;
+ event->priv->registered = 0;
+ event->priv->desc = event_desc;
switch (event_param->u.syscall.entryexit) {
case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
ret = -EINVAL;
goto register_error;
case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
- event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
+ event->priv->u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
break;
case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
- event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
+ event->priv->u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
break;
}
switch (event_param->u.syscall.abi) {
ret = -EINVAL;
goto register_error;
case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE:
- event_notifier->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
+ event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
break;
case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT:
- event_notifier->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
+ event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
break;
}
- if (!event_notifier->priv->parent.desc) {
+ if (!event->priv->desc) {
ret = -EINVAL;
goto register_error;
}
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event_notifier->parent.enabled = 0;
- event_notifier->priv->parent.registered = 1;
+ event->enabled = 0;
+ event->priv->registered = 1;
/*
* Populate lttng_event_notifier structure before
ret = lttng_uprobes_register_event(event_param->name,
event_param->u.uprobe.fd,
- &event_notifier->parent);
+ event);
if (ret)
goto register_error;
- ret = try_module_get(event_notifier->priv->parent.desc->owner);
+ ret = try_module_get(event->priv->desc->owner);
WARN_ON_ONCE(!ret);
break;
goto register_error;
}
- list_add(&event_notifier->priv->parent.node, &event_notifier_group->event_notifiers_head);
- hlist_add_head(&event_notifier->priv->parent.hlist_node, head);
+ list_add(&event->priv->node, &event_notifier_group->event_notifiers_head);
+ hlist_add_head(&event->priv->hlist_node, head);
/*
* Clear the error counter bucket. The sessiond keeps track of which
return event_notifier;
register_error:
- kmem_cache_free(event_notifier_private_cache, event_notifier_priv);
-cache_private_error:
- kmem_cache_free(event_notifier_cache, event_notifier);
-cache_error:
+ lttng_kernel_event_free(event);
+alloc_error:
exist:
type_error:
return ERR_PTR(ret);
static bool lttng_event_notifier_group_has_active_event_notifiers(
struct lttng_event_notifier_group *event_notifier_group)
{
- struct lttng_event_notifier_enabler *event_notifier_enabler;
+ struct lttng_event_enabler_common *event_enabler;
- list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head,
- node) {
- if (event_notifier_enabler->parent.enabled)
+ list_for_each_entry(event_enabler, &event_notifier_group->enablers_head, node) {
+ if (event_enabler->enabled)
return true;
}
return false;
struct lttng_event_recorder_enabler *event_enabler)
{
mutex_lock(&sessions_mutex);
- list_add(&event_enabler->node, &session->priv->enablers_head);
- event_enabler->published = true;
+ list_add(&event_enabler->parent.node, &session->priv->enablers_head);
+ event_enabler->parent.published = true;
lttng_session_lazy_sync_event_enablers(session);
mutex_unlock(&sessions_mutex);
}
void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler)
{
+ lttng_enabler_destroy(event_enabler);
+ if (event_enabler->published)
+ list_del(&event_enabler->node);
+
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);
- lttng_enabler_destroy(event_enabler);
- if (event_recorder_enabler->published)
- list_del(&event_recorder_enabler->node);
kfree(event_recorder_enabler);
break;
}
struct lttng_event_notifier_enabler *event_notifier_enabler =
container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
- lttng_enabler_destroy(event_enabler);
- if (event_notifier_enabler->published)
- list_del(&event_notifier_enabler->node);
kfree(event_notifier_enabler);
break;
}
struct lttng_event_notifier_enabler *event_notifier_enabler)
{
mutex_lock(&sessions_mutex);
- list_add(&event_notifier_enabler->node, &event_notifier_enabler->group->enablers_head);
- event_notifier_enabler->published = true;
+ list_add(&event_notifier_enabler->parent.node, &event_notifier_enabler->group->enablers_head);
+ event_notifier_enabler->parent.published = true;
lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
mutex_unlock(&sessions_mutex);
}
return ret;
}
+static
+void lttng_event_sync_filter_state(struct lttng_kernel_event_common *event)
+{
+ int has_enablers_without_filter_bytecode = 0, nr_filters = 0;
+ struct lttng_kernel_bytecode_runtime *runtime;
+ struct lttng_enabler_ref *enabler_ref;
+
+ /* Check if has enablers without bytecode enabled */
+ list_for_each_entry(enabler_ref, &event->priv->enablers_ref_head, node) {
+ if (enabler_ref->ref->enabled
+ && list_empty(&enabler_ref->ref->filter_bytecode_head)) {
+ has_enablers_without_filter_bytecode = 1;
+ break;
+ }
+ }
+ event->priv->has_enablers_without_filter_bytecode = has_enablers_without_filter_bytecode;
+
+ /* Enable filters */
+ list_for_each_entry(runtime, &event->priv->filter_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_filters++;
+ }
+ WRITE_ONCE(event->eval_filter, !(has_enablers_without_filter_bytecode || !nr_filters));
+}
+
+static
+void lttng_event_sync_capture_state(struct lttng_kernel_event_common *event)
+{
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ break;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+ struct lttng_kernel_bytecode_runtime *runtime;
+ int nr_captures = 0;
+
+ /* Enable captures */
+ list_for_each_entry(runtime, &event_notifier->priv->capture_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_captures++;
+ }
+ WRITE_ONCE(event_notifier->eval_capture, !!nr_captures);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ }
+}
+
+static
+bool lttng_get_event_enabled_state(struct lttng_kernel_event_common *event)
+{
+ struct lttng_enabler_ref *enabler_ref;
+ bool enabled = false;
+
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ /* Enable events */
+ list_for_each_entry(enabler_ref, &event->priv->enablers_ref_head, node) {
+ if (enabler_ref->ref->enabled) {
+ enabled = true;
+ break;
+ }
+ }
+ break;
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
+
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ /*
+ * Enabled state is based on union of enablers, with
+ * intersection of session and channel transient enable
+ * states.
+ */
+ return enabled && event_recorder->chan->parent.session->priv->tstate && event_recorder->chan->priv->parent.tstate;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ return enabled;
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
+}
+
+static
+bool lttng_event_is_lazy_sync(struct lttng_kernel_event_common *event)
+{
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ return true;
+
+ default:
+ /* Not handled with lazy sync. */
+ return false;
+ }
+}
+
/*
- * lttng_session_sync_event_enablers should be called just before starting a
- * session.
* Should be called with sessions mutex held.
*/
static
-void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
+void lttng_sync_event_list(struct list_head *event_enabler_list,
+ struct list_head *event_list)
{
- struct lttng_event_recorder_enabler *event_enabler;
- struct lttng_kernel_event_recorder_private *event_recorder_priv;
+ struct lttng_kernel_event_common_private *event_priv;
+ struct lttng_event_enabler_common *event_enabler;
+
+ list_for_each_entry(event_enabler, event_enabler_list, node)
+ lttng_event_enabler_ref_events(event_enabler);
- list_for_each_entry(event_enabler, &session->priv->enablers_head, node)
- lttng_event_enabler_ref_events(&event_enabler->parent);
/*
* For each event, if at least one of its enablers is enabled,
* and its channel and session transient states are enabled, we
* enable the event, else we disable it.
*/
- list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node) {
- struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
- struct lttng_enabler_ref *enabler_ref;
- struct lttng_kernel_bytecode_runtime *runtime;
- int enabled = 0, has_enablers_without_filter_bytecode = 0;
- int nr_filters = 0;
-
- switch (event_recorder_priv->parent.instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_SYSCALL:
- /* Enable events */
- list_for_each_entry(enabler_ref,
- &event_recorder_priv->parent.enablers_ref_head, node) {
- if (enabler_ref->ref->enabled) {
- enabled = 1;
- break;
- }
- }
- break;
+ list_for_each_entry(event_priv, event_list, node) {
+ struct lttng_kernel_event_common *event = event_priv->pub;
+ bool enabled;
- default:
- /* Not handled with lazy sync. */
+ if (!lttng_event_is_lazy_sync(event))
continue;
- }
- /*
- * Enabled state is based on union of enablers, with
- * intesection of session and channel transient enable
- * states.
- */
- enabled = enabled && session->priv->tstate && event_recorder->chan->priv->parent.tstate;
- WRITE_ONCE(event_recorder->parent.enabled, enabled);
+ enabled = lttng_get_event_enabled_state(event);
+ WRITE_ONCE(event->enabled, enabled);
/*
- * Sync tracepoint registration with event enabled
- * state.
+ * Sync tracepoint registration with event enabled state.
*/
if (enabled) {
- register_event(&event_recorder->parent);
+ register_event(event);
} else {
- _lttng_event_unregister(&event_recorder->parent);
- }
-
- /* Check if has enablers without bytecode enabled */
- list_for_each_entry(enabler_ref,
- &event_recorder_priv->parent.enablers_ref_head, node) {
- if (enabler_ref->ref->enabled
- && list_empty(&enabler_ref->ref->filter_bytecode_head)) {
- has_enablers_without_filter_bytecode = 1;
- break;
- }
+ _lttng_event_unregister(event);
}
- event_recorder_priv->parent.has_enablers_without_filter_bytecode =
- has_enablers_without_filter_bytecode;
- /* Enable filters */
- list_for_each_entry(runtime,
- &event_recorder_priv->parent.filter_bytecode_runtime_head, node) {
- lttng_bytecode_sync_state(runtime);
- nr_filters++;
- }
- WRITE_ONCE(event_recorder_priv->parent.pub->eval_filter,
- !(has_enablers_without_filter_bytecode || !nr_filters));
+ lttng_event_sync_filter_state(event);
+ lttng_event_sync_capture_state(event);
}
}
+/*
+ * lttng_session_sync_event_enablers should be called just before starting a
+ * session.
+ */
+static
+void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
+{
+ lttng_sync_event_list(&session->priv->enablers_head, &session->priv->events);
+}
+
/*
* Apply enablers to session events, adding events to session if need
* be. It is required after each modification applied to an active
static
void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group)
{
- struct lttng_event_notifier_enabler *event_notifier_enabler;
- struct lttng_kernel_event_notifier_private *event_notifier_priv;
-
- list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node)
- lttng_event_enabler_ref_events(&event_notifier_enabler->parent);
-
- /*
- * For each event_notifier, if at least one of its enablers is enabled,
- * we enable the event_notifier, else we disable it.
- */
- list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, parent.node) {
- struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
- struct lttng_enabler_ref *enabler_ref;
- struct lttng_kernel_bytecode_runtime *runtime;
- int enabled = 0, has_enablers_without_filter_bytecode = 0;
- int nr_filters = 0, nr_captures = 0;
-
- switch (event_notifier_priv->parent.instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_SYSCALL:
- /* Enable event_notifiers */
- list_for_each_entry(enabler_ref,
- &event_notifier_priv->parent.enablers_ref_head, node) {
- if (enabler_ref->ref->enabled) {
- enabled = 1;
- break;
- }
- }
- break;
-
- default:
- /* Not handled with sync. */
- continue;
- }
-
- WRITE_ONCE(event_notifier->parent.enabled, enabled);
- /*
- * Sync tracepoint registration with event_notifier enabled
- * state.
- */
- if (enabled) {
- if (!event_notifier_priv->parent.registered)
- register_event(&event_notifier->parent);
- } else {
- if (event_notifier_priv->parent.registered)
- _lttng_event_unregister(&event_notifier->parent);
- }
-
- /* Check if has enablers without bytecode enabled */
- list_for_each_entry(enabler_ref,
- &event_notifier_priv->parent.enablers_ref_head, node) {
- if (enabler_ref->ref->enabled
- && list_empty(&enabler_ref->ref->filter_bytecode_head)) {
- has_enablers_without_filter_bytecode = 1;
- break;
- }
- }
- event_notifier_priv->parent.has_enablers_without_filter_bytecode =
- has_enablers_without_filter_bytecode;
-
- /* Enable filters */
- list_for_each_entry(runtime,
- &event_notifier_priv->parent.filter_bytecode_runtime_head, node) {
- lttng_bytecode_sync_state(runtime);
- nr_filters++;
- }
- WRITE_ONCE(event_notifier_priv->parent.pub->eval_filter,
- !(has_enablers_without_filter_bytecode || !nr_filters));
-
- /* Enable captures */
- list_for_each_entry(runtime,
- &event_notifier_priv->capture_bytecode_runtime_head, node) {
- lttng_bytecode_sync_state(runtime);
- nr_captures++;
- }
- WRITE_ONCE(event_notifier->eval_capture, !!nr_captures);
- }
+ lttng_sync_event_list(&event_notifier_group->enablers_head, &event_notifier_group->event_notifiers_head);
}
static
projects / lttng-modules.git / blobdiff