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)
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);
}
}
}
+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;
- int enabled = 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);
+ _lttng_event_unregister(event);
}
- lttng_event_sync_filter_state(&event_recorder_priv->pub->parent);
+ 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;
- int enabled = 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);
- }
-
- lttng_event_sync_filter_state(&event_notifier_priv->pub->parent);
- lttng_event_sync_capture_state(&event_notifier_priv->pub->parent);
- }
+ lttng_sync_event_list(&event_notifier_group->enablers_head, &event_notifier_group->event_notifiers_head);
}
static