static void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session);
static void lttng_session_sync_event_enablers(struct lttng_kernel_session *session);
-static void lttng_event_notifier_enabler_destroy(struct lttng_event_notifier_enabler *event_notifier_enabler);
static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group);
+static void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_enabler);
static void _lttng_event_destroy(struct lttng_kernel_event_common *event);
static void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan);
-static int _lttng_event_unregister(struct lttng_kernel_event_recorder *event);
+static int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event);
static int _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier);
static
int _lttng_event_metadata_statedump(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_recorder_enabler *event_enabler, *tmp_event_enabler;
+ struct lttng_event_recorder_enabler *event_recorder_enabler, *tmp_event_recorder_enabler;
int ret;
mutex_lock(&sessions_mutex);
WRITE_ONCE(session->active, 0);
list_for_each_entry(chan_priv, &session->priv->chan, node) {
- ret = lttng_syscalls_unregister_channel(chan_priv->pub);
+ ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
list_for_each_entry(event_recorder_priv, &session->priv->events, node) {
- ret = _lttng_event_unregister(event_recorder_priv->pub);
+ ret = _lttng_event_recorder_unregister(event_recorder_priv->pub);
WARN_ON(ret);
}
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan_priv, &session->priv->chan, node) {
- ret = lttng_syscalls_destroy_event(chan_priv->pub);
+ ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
- list_for_each_entry_safe(event_enabler, tmp_event_enabler,
+ list_for_each_entry_safe(event_recorder_enabler, tmp_event_recorder_enabler,
&session->priv->enablers_head, node)
- lttng_event_enabler_destroy(event_enabler);
+ lttng_event_enabler_destroy(&event_recorder_enabler->parent);
list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, node)
_lttng_event_destroy(&event_recorder_priv->pub->parent);
list_for_each_entry_safe(chan_priv, tmpchan_priv, &session->priv->chan, node) {
mutex_lock(&sessions_mutex);
- ret = lttng_syscalls_unregister_event_notifier_group(event_notifier_group);
+ ret = lttng_syscalls_unregister_syscall_table(&event_notifier_group->syscall_table);
WARN_ON(ret);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
irq_work_sync(&event_notifier_group->wakeup_pending);
- kfree(event_notifier_group->syscall_table.sc_filter);
+ 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,
&event_notifier_group->enablers_head, node)
- lttng_event_notifier_enabler_destroy(event_notifier_enabler);
+ lttng_event_enabler_destroy(&event_notifier_enabler->parent);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
&event_notifier_group->event_notifiers_head, node)
return ret;
}
-int lttng_channel_enable(struct lttng_kernel_channel_buffer *channel)
+static
+bool is_channel_buffer_metadata(struct lttng_kernel_channel_common *channel)
+{
+ struct lttng_kernel_channel_buffer *chan_buf;
+
+ if (channel->type != LTTNG_KERNEL_CHANNEL_TYPE_BUFFER)
+ return false;
+ chan_buf = container_of(channel, struct lttng_kernel_channel_buffer, parent);
+ if (chan_buf->priv->channel_type == METADATA_CHANNEL)
+ return true;
+ return false;
+}
+
+int lttng_channel_enable(struct lttng_kernel_channel_common *channel)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (channel->priv->channel_type == METADATA_CHANNEL) {
+ if (is_channel_buffer_metadata(channel)) {
ret = -EPERM;
goto end;
}
- if (channel->parent.enabled) {
+ if (channel->enabled) {
ret = -EEXIST;
goto end;
}
/* Set transient enabler state to "enabled" */
- channel->priv->parent.tstate = 1;
- lttng_session_sync_event_enablers(channel->parent.session);
+ channel->priv->tstate = 1;
+ lttng_session_sync_event_enablers(channel->session);
/* Set atomically the state to "enabled" */
- WRITE_ONCE(channel->parent.enabled, 1);
+ WRITE_ONCE(channel->enabled, 1);
end:
mutex_unlock(&sessions_mutex);
return ret;
}
-int lttng_channel_disable(struct lttng_kernel_channel_buffer *channel)
+int lttng_channel_disable(struct lttng_kernel_channel_common *channel)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (channel->priv->channel_type == METADATA_CHANNEL) {
+ if (is_channel_buffer_metadata(channel)) {
ret = -EPERM;
goto end;
}
- if (!channel->parent.enabled) {
+ if (!channel->enabled) {
ret = -EEXIST;
goto end;
}
/* Set atomically the state to "disabled" */
- WRITE_ONCE(channel->parent.enabled, 0);
+ WRITE_ONCE(channel->enabled, 0);
/* Set transient enabler state to "enabled" */
- channel->priv->parent.tstate = 0;
- lttng_session_sync_event_enablers(channel->parent.session);
+ channel->priv->tstate = 0;
+ lttng_session_sync_event_enablers(channel->session);
end:
mutex_unlock(&sessions_mutex);
return ret;
return ret;
}
-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,
ret = lttng_uprobes_register_event(event_param->name,
event_param->u.uprobe.fd,
- event_recorder);
+ &event_recorder->parent);
if (ret)
goto register_error;
ret = try_module_get(event_recorder->priv->parent.desc->owner);
*/
smp_wmb();
- ret = lttng_uprobes_register_event_notifier(
- event_notifier_param->event.name,
+ ret = lttng_uprobes_register_event(event_notifier_param->event.name,
event_notifier_param->event.u.uprobe.fd,
- event_notifier);
+ &event_notifier->parent);
if (ret)
goto register_error;
ret = try_module_get(event_notifier->priv->parent.desc->owner);
/* Only used for tracepoints for now. */
static
-void register_event(struct lttng_kernel_event_recorder *event_recorder)
+void register_event_recorder(struct lttng_kernel_event_recorder *event_recorder)
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
case LTTNG_KERNEL_ABI_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
desc->tp_class->probe_callback,
- event_recorder);
+ &event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder);
+ ret = lttng_syscall_filter_enable_event(&event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_KPROBE:
/*
* Only used internally at session destruction.
*/
-int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
+int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_recorder)
{
struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent;
const struct lttng_kernel_event_desc *desc;
case LTTNG_KERNEL_ABI_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname,
event_priv->desc->tp_class->probe_callback,
- event_recorder);
+ &event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_KPROBE:
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_disable_event(event_recorder->chan, event_recorder);
+ ret = lttng_syscall_filter_disable_event(&event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_NOOP:
break;
case LTTNG_KERNEL_ABI_UPROBE:
- lttng_uprobes_unregister_event(event_recorder);
+ lttng_uprobes_unregister_event(&event_recorder->parent);
ret = 0;
break;
case LTTNG_KERNEL_ABI_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
desc->tp_class->probe_callback,
- event_notifier);
+ &event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
+ ret = lttng_syscall_filter_enable_event(&event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_KPROBE:
case LTTNG_KERNEL_ABI_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_unregister(event_notifier->priv->parent.desc->event_kname,
event_notifier->priv->parent.desc->tp_class->probe_callback,
- event_notifier);
+ &event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_KPROBE:
break;
case LTTNG_KERNEL_ABI_UPROBE:
- lttng_uprobes_unregister_event_notifier(event_notifier);
+ lttng_uprobes_unregister_event(&event_notifier->parent);
ret = 0;
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_disable_event_notifier(event_notifier);
+ ret = lttng_syscall_filter_disable_event(&event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
case LTTNG_KERNEL_ABI_UPROBE:
module_put(event_priv->desc->owner);
- lttng_uprobes_destroy_event_private(event_recorder);
+ lttng_uprobes_destroy_event_private(&event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_FUNCTION:
case LTTNG_KERNEL_ABI_UPROBE:
module_put(event_notifier->priv->parent.desc->owner);
- lttng_uprobes_destroy_event_notifier_private(event_notifier);
+ lttng_uprobes_destroy_event_private(&event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
{
int ret;
- ret = lttng_syscalls_register_event(event_enabler);
+ ret = lttng_syscalls_register_event(&event_enabler->parent);
WARN_ON_ONCE(ret);
}
{
int ret;
- ret = lttng_syscalls_register_event_notifier(event_notifier_enabler);
+ ret = lttng_syscalls_register_event(&event_notifier_enabler->parent);
WARN_ON_ONCE(ret);
ret = lttng_syscalls_create_matching_event_notifiers(event_notifier_enabler);
WARN_ON_ONCE(ret);
mutex_unlock(&sessions_mutex);
}
-int lttng_event_enabler_enable(struct lttng_event_recorder_enabler *event_enabler)
+int lttng_event_enabler_enable(struct lttng_event_enabler_common *event_enabler)
{
mutex_lock(&sessions_mutex);
- lttng_event_recorder_enabler_as_enabler(event_enabler)->enabled = 1;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session);
+ event_enabler->enabled = 1;
+ lttng_event_enabler_sync(event_enabler);
mutex_unlock(&sessions_mutex);
return 0;
}
-int lttng_event_enabler_disable(struct lttng_event_recorder_enabler *event_enabler)
+int lttng_event_enabler_disable(struct lttng_event_enabler_common *event_enabler)
{
mutex_lock(&sessions_mutex);
- lttng_event_recorder_enabler_as_enabler(event_enabler)->enabled = 0;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session);
+ event_enabler->enabled = 0;
+ lttng_event_enabler_sync(event_enabler);
mutex_unlock(&sessions_mutex);
return 0;
}
ret = lttng_enabler_attach_filter_bytecode(event_enabler, bytecode);
if (ret)
goto error;
-
- 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_session_lazy_sync_event_enablers(event_recorder_enabler->chan->parent.session);
- 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);
- lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
- break;
- }
- default:
- WARN_ON_ONCE(1);
- return -ENOSYS;
- }
+ lttng_event_enabler_sync(event_enabler);
return 0;
error:
}
}
-void lttng_event_enabler_destroy(struct lttng_event_recorder_enabler *event_enabler)
+void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler)
{
- lttng_enabler_destroy(lttng_event_recorder_enabler_as_enabler(event_enabler));
+ 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;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
- if (event_enabler->published)
- list_del(&event_enabler->node);
- kfree(event_enabler);
+ list_del(&event_notifier_enabler->node);
+ lttng_enabler_destroy(event_enabler);
+ kfree(event_notifier_enabler);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ }
}
struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
return ret;
}
-static
-void lttng_event_notifier_enabler_destroy(
- struct lttng_event_notifier_enabler *event_notifier_enabler)
-{
- if (!event_notifier_enabler) {
- return;
- }
-
- list_del(&event_notifier_enabler->node);
-
- lttng_enabler_destroy(lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
- kfree(event_notifier_enabler);
-}
-
/*
* lttng_session_sync_event_enablers should be called just before starting a
* session.
* state.
*/
if (enabled) {
- register_event(event_recorder);
+ register_event_recorder(event_recorder);
} else {
- _lttng_event_unregister(event_recorder);
+ _lttng_event_recorder_unregister(event_recorder);
}
/* Check if has enablers without bytecode enabled */
}
}
+static
+void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_enabler)
+{
+ 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_session_lazy_sync_event_enablers(event_recorder_enabler->chan->parent.session);
+ 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);
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ }
+}
+
/*
* Serialize at most one packet worth of metadata into a metadata
* channel.
projects / lttng-modules.git / blobdiff