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_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier);
+static void _lttng_event_unregister(struct lttng_kernel_event_recorder *event);
+static void _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 *chan,
ret = lttng_syscalls_unregister_channel(chan_priv->pub);
WARN_ON(ret);
}
- list_for_each_entry(event_recorder_priv, &session->priv->events, node) {
- ret = _lttng_event_unregister(event_recorder_priv->pub);
- WARN_ON(ret);
- }
+ list_for_each_entry(event_recorder_priv, &session->priv->events, node)
+ _lttng_event_unregister(event_recorder_priv->pub);
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);
WARN_ON(ret);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
- &event_notifier_group->event_notifiers_head, node) {
- ret = _lttng_event_notifier_unregister(event_notifier_priv->pub);
- WARN_ON(ret);
- }
+ &event_notifier_group->event_notifiers_head, node)
+ _lttng_event_notifier_unregister(event_notifier_priv->pub);
/* Wait for in-flight event notifier to complete */
synchronize_trace();
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event_recorder->priv->parent.registered)
- return;
+ WARN_ON_ONCE(event_recorder->priv->parent.registered);
desc = event_recorder->priv->parent.desc;
switch (event_recorder->priv->parent.instrumentation) {
/*
* Only used internally at session destruction.
*/
-int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
+static
+void unregister_event(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;
int ret = -EINVAL;
- if (!event_priv->registered)
- return 0;
+ WARN_ON_ONCE(!event_priv->registered);
desc = event_priv->desc;
switch (event_priv->instrumentation) {
default:
WARN_ON_ONCE(1);
}
+ WARN_ON_ONCE(ret);
if (!ret)
event_priv->registered = 0;
- return ret;
+}
+
+static
+void _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
+{
+ if (event_recorder->priv->parent.registered)
+ unregister_event(event_recorder);
}
/* Only used for tracepoints for now. */
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event_notifier->priv->parent.registered)
- return;
+ WARN_ON_ONCE(event_notifier->priv->parent.registered);
desc = event_notifier->priv->parent.desc;
switch (event_notifier->priv->parent.instrumentation) {
}
static
-int _lttng_event_notifier_unregister(
- struct lttng_kernel_event_notifier *event_notifier)
+int unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (!event_notifier->priv->parent.registered)
- return 0;
+ WARN_ON_ONCE(!event_notifier->priv->parent.registered);
desc = event_notifier->priv->parent.desc;
switch (event_notifier->priv->parent.instrumentation) {
return ret;
}
+static
+void _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier)
+{
+ if (event_notifier->priv->parent.registered)
+ unregister_event_notifier(event_notifier);
+}
+
/*
* Only used internally at session destruction.
*/
* state.
*/
if (enabled) {
- register_event(event_recorder);
+ if (!event_recorder_priv->parent.registered)
+ register_event(event_recorder);
} else {
- _lttng_event_unregister(event_recorder);
+ if (event_recorder_priv->parent.registered)
+ _lttng_event_unregister(event_recorder);
}
/* Check if has enablers without bytecode enabled */
register_event_notifier(event_notifier);
} else {
if (event_notifier_priv->parent.registered)
- _lttng_event_notifier_unregister(event_notifier);
+ unregister_event_notifier(event_notifier);
}
/* Check if has enablers without bytecode enabled */