Refactor struct lttng_ust_lib_ring_buffer_ctx

[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 5e5021223b120dd95a14276d89b670572e81a073..6ad34390f6b61ecfe4f29538cbb2fc95591bbf79 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -107,7 +107,7 @@ void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
 #undef _TRACEPOINT_EVENT_INSTANCE
 #define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \
 static const char                                                      \
-       __tp_name_len_check##_provider##___##_name[LTTNG_UST_SYM_NAME_LEN] \
+       __tp_name_len_check##_provider##___##_name[LTTNG_UST_ABI_SYM_NAME_LEN] \
        __attribute__((unused)) =                                       \
                #_provider ":" #_name;
 
@@ -886,8 +886,8 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))           \
        __lttng_ctx.event_recorder = __event_recorder;                        \
        __lttng_ctx.chan_ctx = tp_rcu_dereference(__chan->ctx);               \
        __lttng_ctx.event_ctx = tp_rcu_dereference(__event_recorder->ctx);    \
-       lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event_recorder, __event_len,  \
-                                __event_align, -1, __chan->handle, &__lttng_ctx); \
+       lib_ring_buffer_ctx_init(&__ctx, __chan->chan, &__lttng_ctx, __event_len,  \
+                                __event_align, -1, __chan->handle); \
        __ctx.ip = _TP_IP_PARAM(TP_IP_PARAM);                                 \
        __ret = __chan->ops->event_reserve(&__ctx, __event_recorder->id);     \
        if (__ret < 0)                                                        \
@@ -935,24 +935,24 @@ void __event_notifier_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))
 static                                                                       \
 void __event_notifier_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))     \
 {                                                                            \
-       struct lttng_event_notifier *__event_notifier = (struct lttng_event_notifier *) __tp_data; \
+       struct lttng_ust_event_notifier *__event_notifier = (struct lttng_ust_event_notifier *) __tp_data; \
        const size_t __num_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_name) - 1;\
        union {                                                               \
                size_t __dynamic_len[__num_fields];                           \
                char __interpreter_stack_data[2 * sizeof(unsigned long) * __num_fields]; \
        } __stackvar;                                                         \
                                                                              \
-       if (caa_unlikely(!CMM_ACCESS_ONCE(__event_notifier->enabled)))        \
+       if (caa_unlikely(!CMM_ACCESS_ONCE(__event_notifier->parent->enabled))) \
                return;                                                       \
        if (caa_unlikely(!TP_RCU_LINK_TEST()))                                \
                return;                                                       \
-       if (caa_unlikely(!cds_list_empty(&__event_notifier->filter_bytecode_runtime_head))) { \
+       if (caa_unlikely(!cds_list_empty(&__event_notifier->parent->filter_bytecode_runtime_head))) { \
                struct lttng_bytecode_runtime *__filter_bc_runtime;                    \
-               int __filter_record = __event_notifier->has_enablers_without_bytecode; \
+               int __filter_record = __event_notifier->parent->has_enablers_without_bytecode; \
                                                                              \
                __event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
                        _TP_ARGS_DATA_VAR(_args));                            \
-               tp_list_for_each_entry_rcu(__filter_bc_runtime, &__event_notifier->filter_bytecode_runtime_head, node) { \
+               tp_list_for_each_entry_rcu(__filter_bc_runtime, &__event_notifier->parent->filter_bytecode_runtime_head, node) { \
                        if (caa_unlikely(__filter_bc_runtime->interpreter_funcs.filter(__filter_bc_runtime,       \
                                        __stackvar.__interpreter_stack_data) & LTTNG_INTERPRETER_RECORD_FLAG)) \
                                __filter_record = 1;                          \