#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>
#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 **); \
}
_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 **); \
}
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; \
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)); \
{
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);
}
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);