Refactoring: move enablers list into common structure
[lttng-modules.git] / src / lttng-events.c
index b6375338bc822ed3ecd83da5f221bafd5aeaf30a..6d3e3f1a2c64089e4a5761e13088da07e747e49a 100644 (file)
@@ -353,7 +353,7 @@ void lttng_session_destroy(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_recorder_enabler, *tmp_event_recorder_enabler;
+       struct lttng_event_enabler_common *event_enabler, *tmp_event_enabler;
        int ret;
 
        mutex_lock(&sessions_mutex);
@@ -371,9 +371,8 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
                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) {
@@ -400,7 +399,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session)
 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;
 
@@ -426,9 +425,9 @@ void lttng_event_notifier_group_destroy(
        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)
@@ -2318,11 +2317,10 @@ int lttng_fix_pending_events(void)
 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;
@@ -2373,8 +2371,8 @@ void lttng_event_enabler_session_add(struct lttng_kernel_session *session,
                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);
 }
@@ -2470,15 +2468,16 @@ void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler)
 
 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;
        }
@@ -2487,9 +2486,6 @@ void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enable
                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;
        }
@@ -2530,8 +2526,8 @@ void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *e
                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);
 }
@@ -2598,6 +2594,57 @@ end:
        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);
+       }
+}
+
 /*
  * lttng_session_sync_event_enablers should be called just before starting a
  * session.
@@ -2606,11 +2653,11 @@ end:
 static
 void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
 {
-       struct lttng_event_recorder_enabler *event_enabler;
+       struct lttng_event_enabler_common *event_enabler;
        struct lttng_kernel_event_recorder_private *event_recorder_priv;
 
        list_for_each_entry(event_enabler, &session->priv->enablers_head, node)
-               lttng_event_enabler_ref_events(&event_enabler->parent);
+               lttng_event_enabler_ref_events(event_enabler);
        /*
         * For each event, if at least one of its enablers is enabled,
         * and its channel and session transient states are enabled, we
@@ -2619,9 +2666,7 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
        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;
+               int enabled = 0;
 
                switch (event_recorder_priv->parent.instrumentation) {
                case LTTNG_KERNEL_ABI_TRACEPOINT:
@@ -2659,26 +2704,7 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
                        _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;
-                       }
-               }
-               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_recorder_priv->pub->parent);
        }
 }
 
@@ -2701,11 +2727,11 @@ void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session
 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_event_enabler_common *event_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);
+       list_for_each_entry(event_enabler, &event_notifier_group->enablers_head, node)
+               lttng_event_enabler_ref_events(event_enabler);
 
        /*
         * For each event_notifier, if at least one of its enablers is enabled,
@@ -2714,9 +2740,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
        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;
+               int enabled = 0;
 
                switch (event_notifier_priv->parent.instrumentation) {
                case LTTNG_KERNEL_ABI_TRACEPOINT:
@@ -2750,34 +2774,8 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
                                _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_event_sync_filter_state(&event_notifier_priv->pub->parent);
+               lttng_event_sync_capture_state(&event_notifier_priv->pub->parent);
        }
 }
 
This page took 0.027339 seconds and 4 git commands to generate.