Refactoring: bytecode interpreter

[lttng-modules.git] / src / lttng-events.c

diff --git a/src/lttng-events.c b/src/lttng-events.c
index c956db54a194c3bf0493b43edd3055bfb61379a7..d881bddceb4c94fc0033f42b23b8c9a89b012c40 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -603,57 +603,37 @@ end:
        return ret;
 }
 
-int lttng_event_enable(struct lttng_kernel_event_recorder *event_recorder)
+int lttng_event_enable(struct lttng_kernel_event_common *event)
 {
-       struct lttng_kernel_event_common *event = &event_recorder->parent;
        int ret = 0;
 
        mutex_lock(&sessions_mutex);
-       if (event_recorder->chan->channel_type == METADATA_CHANNEL) {
-               ret = -EPERM;
-               goto end;
-       }
-       if (event->enabled) {
-               ret = -EEXIST;
-               goto end;
-       }
-       switch (event->priv->instrumentation) {
-       case LTTNG_KERNEL_ABI_TRACEPOINT:       /* Fall-through */
-       case LTTNG_KERNEL_ABI_SYSCALL:
-               ret = -EINVAL;
-               break;
+       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);
 
-       case LTTNG_KERNEL_ABI_KPROBE:           /* Fall-through */
-       case LTTNG_KERNEL_ABI_UPROBE:
-               WRITE_ONCE(event->enabled, 1);
+               if (event_recorder->chan->channel_type == METADATA_CHANNEL) {
+                       ret = -EPERM;
+                       goto end;
+               }
                break;
-
-       case LTTNG_KERNEL_ABI_KRETPROBE:
-               ret = lttng_kretprobes_event_enable_state(&event_recorder->parent, 1);
+       }
+       case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+               switch (event->priv->instrumentation) {
+               case LTTNG_KERNEL_ABI_KRETPROBE:
+                       ret = -EINVAL;
+                       goto end;
+               default:
+                       break;
+               }
                break;
-
-       case LTTNG_KERNEL_ABI_FUNCTION:         /* Fall-through */
-       case LTTNG_KERNEL_ABI_NOOP:             /* Fall-through */
        default:
-               WARN_ON_ONCE(1);
-               ret = -EINVAL;
+               break;
        }
-end:
-       mutex_unlock(&sessions_mutex);
-       return ret;
-}
-
-int lttng_event_disable(struct lttng_kernel_event_recorder *event_recorder)
-{
-       struct lttng_kernel_event_common *event = &event_recorder->parent;
-       int ret = 0;
 
-       mutex_lock(&sessions_mutex);
-       if (event_recorder->chan->channel_type == METADATA_CHANNEL) {
-               ret = -EPERM;
-               goto end;
-       }
-       if (!event->enabled) {
+       if (event->enabled) {
                ret = -EEXIST;
                goto end;
        }
@@ -665,12 +645,11 @@ int lttng_event_disable(struct lttng_kernel_event_recorder *event_recorder)
 
        case LTTNG_KERNEL_ABI_KPROBE:           /* Fall-through */
        case LTTNG_KERNEL_ABI_UPROBE:
-               WRITE_ONCE(event->enabled, 0);
+               WRITE_ONCE(event->enabled, 1);
                break;
 
        case LTTNG_KERNEL_ABI_KRETPROBE:
-
-               ret = lttng_kretprobes_event_enable_state(&event_recorder->parent, 0);
+               ret = lttng_kretprobes_event_enable_state(event, 1);
                break;
 
        case LTTNG_KERNEL_ABI_FUNCTION:         /* Fall-through */
@@ -684,45 +663,36 @@ end:
        return ret;
 }
 
-int lttng_event_notifier_enable(struct lttng_kernel_event_notifier *event_notifier)
+int lttng_event_disable(struct lttng_kernel_event_common *event)
 {
-       struct lttng_kernel_event_common *event = &event_notifier->parent;
        int ret = 0;
 
        mutex_lock(&sessions_mutex);
-       if (event->enabled) {
-               ret = -EEXIST;
-               goto end;
-       }
-       switch (event->priv->instrumentation) {
-       case LTTNG_KERNEL_ABI_TRACEPOINT:       /* Fall-through */
-       case LTTNG_KERNEL_ABI_SYSCALL:
-               ret = -EINVAL;
-               break;
+       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);
 
-       case LTTNG_KERNEL_ABI_KPROBE:           /* Fall-through */
-       case LTTNG_KERNEL_ABI_UPROBE:
-               WRITE_ONCE(event->enabled, 1);
+               if (event_recorder->chan->channel_type == METADATA_CHANNEL) {
+                       ret = -EPERM;
+                       goto end;
+               }
+               break;
+       }
+       case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+               switch (event->priv->instrumentation) {
+               case LTTNG_KERNEL_ABI_KRETPROBE:
+                       ret = -EINVAL;
+                       goto end;
+               default:
+                       break;
+               }
                break;
-
-       case LTTNG_KERNEL_ABI_FUNCTION:         /* Fall-through */
-       case LTTNG_KERNEL_ABI_KRETPROBE:        /* Fall-through */
-       case LTTNG_KERNEL_ABI_NOOP:             /* Fall-through */
        default:
-               WARN_ON_ONCE(1);
-               ret = -EINVAL;
+               break;
        }
-end:
-       mutex_unlock(&sessions_mutex);
-       return ret;
-}
-
-int lttng_event_notifier_disable(struct lttng_kernel_event_notifier *event_notifier)
-{
-       struct lttng_kernel_event_common *event = &event_notifier->parent;
-       int ret = 0;
 
-       mutex_lock(&sessions_mutex);
        if (!event->enabled) {
                ret = -EEXIST;
                goto end;
@@ -738,8 +708,11 @@ int lttng_event_notifier_disable(struct lttng_kernel_event_notifier *event_notif
                WRITE_ONCE(event->enabled, 0);
                break;
 
+       case LTTNG_KERNEL_ABI_KRETPROBE:
+               ret = lttng_kretprobes_event_enable_state(event, 0);
+               break;
+
        case LTTNG_KERNEL_ABI_FUNCTION:         /* Fall-through */
-       case LTTNG_KERNEL_ABI_KRETPROBE:        /* Fall-through */
        case LTTNG_KERNEL_ABI_NOOP:             /* Fall-through */
        default:
                WARN_ON_ONCE(1);
@@ -912,6 +885,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
        event_recorder->parent.priv = &event_recorder_priv->parent;
        event_recorder->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
 
+       event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter;
        event_recorder->chan = chan;
        event_recorder->priv->id = chan->free_event_id++;
        event_recorder->priv->parent.instrumentation = itype;
@@ -987,6 +961,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
                event_recorder_return->parent.priv = &event_recorder_return_priv->parent;
                event_recorder_return->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
 
+               event_recorder_return->parent.run_filter = lttng_kernel_interpret_event_filter;
                event_recorder_return->chan = chan;
                event_recorder_return->priv->id = chan->free_event_id++;
                event_recorder_return->priv->parent.instrumentation = itype;
@@ -1188,6 +1163,7 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
        INIT_LIST_HEAD(&event_notifier->priv->parent.filter_bytecode_runtime_head);
        INIT_LIST_HEAD(&event_notifier->priv->parent.enablers_ref_head);
        INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head);
+       event_notifier->parent.run_filter = lttng_kernel_interpret_event_filter;
 
        switch (itype) {
        case LTTNG_KERNEL_ABI_TRACEPOINT:
@@ -2489,7 +2465,7 @@ int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
        if (ret)
                goto error_free;
 
-       bytecode_node->type = LTTNG_BYTECODE_NODE_TYPE_FILTER;
+       bytecode_node->type = LTTNG_KERNEL_BYTECODE_TYPE_FILTER;
        bytecode_node->enabler = enabler;
        /* Enforce length based on allocated size */
        bytecode_node->bc.len = bytecode_len;
@@ -2648,7 +2624,7 @@ int lttng_event_notifier_enabler_attach_capture_bytecode(
        if (ret)
                goto error_free;
 
-       bytecode_node->type = LTTNG_BYTECODE_NODE_TYPE_CAPTURE;
+       bytecode_node->type = LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE;
        bytecode_node->enabler = enabler;
 
        /* Enforce length based on allocated size */
@@ -2755,7 +2731,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
                /* Enable filters */
                list_for_each_entry(runtime,
                                &event_recorder_priv->parent.filter_bytecode_runtime_head, node) {
-                       lttng_bytecode_filter_sync_state(runtime);
+                       lttng_bytecode_sync_state(runtime);
                        nr_filters++;
                }
                WRITE_ONCE(event_recorder_priv->parent.pub->eval_filter,
@@ -2845,7 +2821,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
                /* Enable filters */
                list_for_each_entry(runtime,
                                &event_notifier_priv->parent.filter_bytecode_runtime_head, node) {
-                       lttng_bytecode_filter_sync_state(runtime);
+                       lttng_bytecode_sync_state(runtime);
                        nr_filters++;
                }
                WRITE_ONCE(event_notifier_priv->parent.pub->eval_filter,
@@ -2854,7 +2830,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
                /* Enable captures */
                list_for_each_entry(runtime,
                                &event_notifier_priv->capture_bytecode_runtime_head, node) {
-                       lttng_bytecode_capture_sync_state(runtime);
+                       lttng_bytecode_sync_state(runtime);
                        nr_captures++;
                }
                WRITE_ONCE(event_notifier->eval_capture, !!nr_captures);
@@ -2905,8 +2881,8 @@ int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
        reserve_len = min_t(size_t,
                        stream->transport->ops.packet_avail_size(chan),
                        len);
-       lib_ring_buffer_ctx_init(&ctx, chan, NULL, reserve_len,
-                       sizeof(char), -1);
+       lib_ring_buffer_ctx_init(&ctx, chan, reserve_len,
+                       sizeof(char), -1, NULL);
        /*
         * If reservation failed, return an error to the caller.
         */