Filter iteration: iterate on list of filters

[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 8f0db41fc3c7c5490a38d5186661b7f68005c1af..3cecec9b06bb021bd1f5e14ae3130d4bc43f9095 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>
@@ -296,9 +297,10 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
 #define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite)   \
        {                                                                      \
                unsigned long __ctf_tmp_ulong = (unsigned long) (_length);     \
+               const void *__ctf_tmp_ptr = (_src);                            \
                memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
                __stack_data += sizeof(unsigned long);                         \
-               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **));         \
                __stack_data += sizeof(void **);                               \
        }
 
@@ -307,16 +309,18 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
                        _src_length, _encoding, _nowrite)                      \
        {                                                                      \
                unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
+               const void *__ctf_tmp_ptr = (_src);                            \
                memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
                __stack_data += sizeof(unsigned long);                         \
-               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **));         \
                __stack_data += sizeof(void **);                               \
        }
 
 #undef _ctf_string
 #define _ctf_string(_item, _src, _nowrite)                                    \
        {                                                                      \
-               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               const void *__ctf_tmp_ptr = (_src);                            \
+               memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **));         \
                __stack_data += sizeof(void **);                               \
        }
 
@@ -482,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));                                   \