Decouple `struct lttng_event` from filter code

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

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 0863484f5dd85a3f579198dcaceedb2546e1b4f5..34e5fe9d98e657aaba9de8cac0f250614b6eaff0 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -1345,7 +1345,7 @@ struct lttng_enabler_ref *lttng_enabler_ref(
 }
 
 static
-void lttng_create_tracepoint_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_enabler)
 {
        struct lttng_session *session = event_enabler->chan->session;
        struct lttng_probe_desc *probe_desc;
@@ -1404,7 +1404,7 @@ void lttng_create_tracepoint_if_missing(struct lttng_event_enabler *event_enable
 }
 
 static
-void lttng_create_syscall_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_enabler)
 {
        int ret;
 
@@ -1422,10 +1422,10 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
 {
        switch (event_enabler->base.event_param.instrumentation) {
        case LTTNG_KERNEL_TRACEPOINT:
-               lttng_create_tracepoint_if_missing(event_enabler);
+               lttng_create_tracepoint_event_if_missing(event_enabler);
                break;
        case LTTNG_KERNEL_SYSCALL:
-               lttng_create_syscall_if_missing(event_enabler);
+               lttng_create_syscall_event_if_missing(event_enabler);
                break;
        default:
                WARN_ON_ONCE(1);
@@ -1484,7 +1484,10 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
                /*
                 * Link filter bytecodes if not linked yet.
                 */
-               lttng_event_enabler_link_bytecode(event, event_enabler);
+               lttng_enabler_link_bytecode(event->desc,
+                       lttng_static_ctx,
+                       &event->bytecode_runtime_head,
+                       lttng_event_enabler_as_enabler(event_enabler));
 
                /* TODO: merge event context. */
        }