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);
irq_work_sync(&event_notifier_group->wakeup_pending);
- kfree(event_notifier_group->sc_filter);
+ kfree(event_notifier_group->syscall_table.sc_filter);
list_for_each_entry_safe(event_notifier_enabler, tmp_event_notifier_enabler,
&event_notifier_group->enablers_head, node)
* 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;
- struct lttng_kernel_abi_event *event_param = &event_enabler->base.event_param;
+ struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
struct lttng_kernel_session *session = chan->parent.session;
struct lttng_kernel_event_recorder *event_recorder;
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;
}
int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
- struct lttng_enabler *enabler)
+ struct lttng_event_enabler_common *enabler)
{
const char *desc_name, *enabler_name;
bool compat = false, entry = false;
}
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_enabler *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)
int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler,
struct lttng_kernel_event_notifier *event_notifier)
{
- struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(
+ struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(
event_notifier_enabler);
if (base_enabler->event_param.instrumentation != event_notifier->priv->parent.instrumentation)
return 0;
if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler)
&& event_notifier->priv->group == event_notifier_enabler->group
- && event_notifier->priv->parent.user_token == event_notifier_enabler->base.user_token)
+ && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token)
return 1;
else
return 0;
static
struct lttng_enabler_ref *lttng_enabler_ref(
struct list_head *enablers_ref_list,
- struct lttng_enabler *enabler)
+ struct lttng_event_enabler_common *enabler)
{
struct lttng_enabler_ref *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;
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;
/*
LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
if (event_notifier_priv->parent.desc == desc
- && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token)
+ && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token)
found = 1;
}
if (found)
* We need to create a event_notifier for this event probe.
*/
event_notifier = _lttng_event_notifier_create(desc,
- event_notifier_enabler->base.user_token,
+ event_notifier_enabler->parent.user_token,
event_notifier_enabler->error_counter_index,
event_notifier_group, NULL,
LTTNG_KERNEL_ABI_TRACEPOINT);
}
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;
* 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->base.event_param.instrumentation) {
+ switch (event_enabler->parent.event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
lttng_create_tracepoint_event_if_missing(event_enabler);
break;
* 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_enabler *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 &&
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_all_entry, enabled);
+ 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_all_exit, enabled);
+ WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_exit, enabled);
}
/* First ensure that probe events are created for this 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.
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);
}
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;
}
static
void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler)
{
- switch (event_notifier_enabler->base.event_param.instrumentation) {
+ switch (event_notifier_enabler->parent.event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler);
break;
struct lttng_event_notifier_enabler *event_notifier_enabler)
{
struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
- struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
+ 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;
if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL &&
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_all_entry, enabled);
+ 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_all_exit, enabled);
+ WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_exit, enabled);
}
list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head,
node) {
- if (event_notifier_enabler->base.enabled)
+ if (event_notifier_enabler->parent.enabled)
return true;
}
return false;
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)
return NULL;
- event_enabler->base.format_type = format_type;
- INIT_LIST_HEAD(&event_enabler->base.filter_bytecode_head);
- memcpy(&event_enabler->base.event_param, event_param,
- sizeof(event_enabler->base.event_param));
+ event_enabler->parent.enabler_type = LTTNG_EVENT_ENABLER_TYPE_RECORDER;
+ event_enabler->parent.format_type = format_type;
+ INIT_LIST_HEAD(&event_enabler->parent.filter_bytecode_head);
+ memcpy(&event_enabler->parent.event_param, event_param,
+ sizeof(event_enabler->parent.event_param));
event_enabler->chan = chan;
/* ctx left NULL */
- event_enabler->base.enabled = 0;
+ event_enabler->parent.enabled = 0;
return event_enabler;
}
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);
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;
}
static
-int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
+int lttng_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *enabler,
struct lttng_kernel_abi_filter_bytecode __user *bytecode)
{
struct lttng_kernel_bytecode_node *bytecode_node;
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;
}
static
-void lttng_enabler_destroy(struct lttng_enabler *enabler)
+void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler)
{
struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node;
}
}
-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);
if (!event_notifier_enabler)
return NULL;
- event_notifier_enabler->base.format_type = format_type;
- INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head);
+ event_notifier_enabler->parent.enabler_type = LTTNG_EVENT_ENABLER_TYPE_NOTIFIER;
+ event_notifier_enabler->parent.format_type = format_type;
+ INIT_LIST_HEAD(&event_notifier_enabler->parent.filter_bytecode_head);
INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head);
event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index;
event_notifier_enabler->num_captures = 0;
- memcpy(&event_notifier_enabler->base.event_param, &event_notifier_param->event,
- sizeof(event_notifier_enabler->base.event_param));
+ memcpy(&event_notifier_enabler->parent.event_param, &event_notifier_param->event,
+ sizeof(event_notifier_enabler->parent.event_param));
- event_notifier_enabler->base.enabled = 0;
- event_notifier_enabler->base.user_token = event_notifier_param->event.token;
+ event_notifier_enabler->parent.enabled = 0;
+ event_notifier_enabler->parent.user_token = event_notifier_param->event.token;
event_notifier_enabler->group = event_notifier_group;
mutex_lock(&sessions_mutex);
struct lttng_kernel_abi_capture_bytecode __user *bytecode)
{
struct lttng_kernel_bytecode_node *bytecode_node;
- struct lttng_enabler *enabler =
+ struct lttng_event_enabler_common *enabler =
lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
uint32_t bytecode_len;
int ret;
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)