Cleanup: add lttng_/lttng-/LTTNG_ prefixes

[lttng-ust.git] / include / lttng / ust-tracepoint-event.h

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 74d06e19ad182fc5b8b863543116581f6ae12240..0be3395be7d72996dc7a33645ceabd6048396f9c 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <urcu/compiler.h>
+#include <urcu/rculist.h>
 #include <lttng/ust-events.h>
 #include <lttng/ringbuffer-config.h>
 #include <lttng/ust-compiler.h>
@@ -466,8 +467,8 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));      \
 static                                                                       \
 void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))              \
 {                                                                            \
-       struct ltt_event *__event = __tp_data;                                \
-       struct ltt_channel *__chan = __event->chan;                           \
+       struct lttng_event *__event = __tp_data;                              \
+       struct lttng_channel *__chan = __event->chan;                         \
        struct lttng_ust_lib_ring_buffer_ctx __ctx;                           \
        size_t __event_len, __event_align;                                    \
        size_t __dynamic_len_idx = 0;                                         \
@@ -485,11 +486,16 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))         \
                return;                                                       \
        if (caa_unlikely(!CMM_ACCESS_ONCE(__event->enabled)))                 \
                return;                                                       \
-       if (caa_unlikely(__event->filter)) {                                  \
+       if (caa_unlikely(!cds_list_empty(&__event->bytecode_runtime))) {      \
+               struct lttng_bytecode_runtime *bc_runtime;                    \
+                                                                             \
                __event_prepare_filter_stack__##_provider##___##_name(__stackvar.__filter_stack_data, \
-                       _TP_ARGS_DATA_VAR(_args));                                    \
-               if (caa_likely(!__event->filter(__event->filter_data, __stackvar.__filter_stack_data))) \
-                       return;                                               \
+                       _TP_ARGS_DATA_VAR(_args));                            \
+               cds_list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime, node) { \
+                       if (caa_likely(!bc_runtime->filter(bc_runtime,        \
+                                       __stackvar.__filter_stack_data)))     \
+                               return;                                       \
+               }                                                             \
        }                                                                     \
        __event_len = __event_get_size__##_provider##___##_name(__stackvar.__dynamic_len, \
                 _TP_ARGS_DATA_VAR(_args));                                   \
@@ -645,7 +651,7 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
 {
        int ret;
 
-       ret = ltt_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
+       ret = lttng_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
        assert(!ret);
 }
 
@@ -654,7 +660,7 @@ _TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void);
 static void
 _TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
 {
-       ltt_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
+       lttng_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
 }
 
 int _TP_COMBINE_TOKENS(__tracepoint_provider_, TRACEPOINT_PROVIDER);