#include <urcu/compiler.h>
#include <urcu/rculist.h>
#include <lttng/ust-events.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-arch.h>
#include <lttng/ust-compiler.h>
#include <lttng/tracepoint.h>
#include <lttng/ust-endian.h>
.signedness = 0, \
}, \
.string = (_string), \
- .options = LTTNG_ENUM_ENTRY_OPTION_IS_AUTO, \
+ .options = LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO, \
}),
#undef TP_ENUM_VALUES
#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, \
_encoding, _nowrite, _elem_type_base) \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \
- __chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length));
+ if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
+ __chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length)); \
+ else \
+ __chan->ops->event_strcpy_pad(&__ctx, (const char *) (_src), _length); \
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \
__chan->ops->event_write(&__ctx, &__tmpl, sizeof(_length_type));\
} \
lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(_type)); \
- __chan->ops->event_write(&__ctx, _src, \
- sizeof(_type) * __get_dynamic_len(dest));
+ if (lttng_ust_string_encoding_##_encoding == lttng_ust_string_encoding_none) \
+ __chan->ops->event_write(&__ctx, _src, \
+ sizeof(_type) * __get_dynamic_len(dest)); \
+ else \
+ __chan->ops->event_strcpy_pad(&__ctx, (const char *) (_src), __get_dynamic_len(dest)); \
#undef _ctf_string
#define _ctf_string(_item, _src, _nowrite) \
#define _TP_IP_PARAM(x) (x)
#else /* TP_IP_PARAM */
-#if defined(__PPC__) && !defined(__PPC64__)
+#if defined(LTTNG_UST_ARCH_PPC) && !defined(LTTNG_UST_ARCH_PPC64)
#define _TP_IP_PARAM(x) NULL
-#else /* #if defined(__PPC__) && !defined(__PPC64__) */
+#else
#define _TP_IP_PARAM(x) __builtin_return_address(0)
-#endif /* #else #if defined(__PPC__) && !defined(__PPC64__) */
+#endif
#endif /* TP_IP_PARAM */
char __interpreter_stack_data[2 * sizeof(unsigned long) * __num_fields]; \
} __stackvar; \
int __ret; \
+ bool __interpreter_stack_prepared = false; \
\
if (0) \
(void) __dynamic_len_idx; /* don't warn if unused */ \
case LTTNG_UST_EVENT_TYPE_RECORDER: \
{ \
struct lttng_ust_event_recorder *__event_recorder = (struct lttng_ust_event_recorder *) __event->child; \
- struct lttng_channel *__chan = __event_recorder->chan; \
+ struct lttng_ust_channel_buffer *__chan = __event_recorder->chan; \
+ struct lttng_ust_channel_common *__chan_common = __chan->parent; \
\
- if (!_TP_SESSION_CHECK(session, __chan->session)) \
+ if (!_TP_SESSION_CHECK(session, __chan_common->session)) \
return; \
- if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->session->active))) \
+ if (caa_unlikely(!CMM_ACCESS_ONCE(__chan_common->session->active))) \
return; \
- if (caa_unlikely(!CMM_ACCESS_ONCE(__chan->enabled))) \
+ if (caa_unlikely(!CMM_ACCESS_ONCE(__chan_common->enabled))) \
return; \
break; \
} \
return; \
if (caa_unlikely(!TP_RCU_LINK_TEST())) \
return; \
- if (caa_unlikely(!cds_list_empty(&__event->filter_bytecode_runtime_head))) { \
- struct lttng_ust_bytecode_runtime *__filter_bc_runtime; \
- int __filter_record = __event->has_enablers_without_bytecode; \
- \
+ if (caa_unlikely(CMM_ACCESS_ONCE(__event->eval_filter))) { \
__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->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; \
- break; \
- } \
- } \
- if (caa_likely(!__filter_record)) \
+ __interpreter_stack_prepared = true; \
+ if (caa_likely(__event->run_filter(__event, \
+ __stackvar.__interpreter_stack_data, NULL) != LTTNG_UST_EVENT_FILTER_ACCEPT)) \
return; \
} \
switch (__event->type) { \
{ \
size_t __event_len, __event_align; \
struct lttng_ust_event_recorder *__event_recorder = (struct lttng_ust_event_recorder *) __event->child; \
- struct lttng_channel *__chan = __event_recorder->chan; \
+ struct lttng_ust_channel_buffer *__chan = __event_recorder->chan; \
struct lttng_ust_lib_ring_buffer_ctx __ctx; \
struct lttng_ust_stack_ctx __lttng_ctx; \
\
memset(&__lttng_ctx, 0, sizeof(__lttng_ctx)); \
__lttng_ctx.struct_size = sizeof(struct lttng_ust_stack_ctx); \
__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, &__lttng_ctx, __event_len, \
__event_align, -1, __chan->handle); \
__ctx.ip = _TP_IP_PARAM(TP_IP_PARAM); \
case LTTNG_UST_EVENT_TYPE_NOTIFIER: \
{ \
struct lttng_ust_event_notifier *__event_notifier = (struct lttng_ust_event_notifier *) __event->child; \
+ struct lttng_ust_notification_ctx __notif_ctx; \
+ \
+ __notif_ctx.struct_size = sizeof(struct lttng_ust_notification_ctx); \
+ __notif_ctx.eval_capture = CMM_ACCESS_ONCE(__event_notifier->eval_capture); \
\
- if (caa_unlikely(!cds_list_empty(&__event_notifier->capture_bytecode_runtime_head))) \
+ if (caa_unlikely(!__interpreter_stack_prepared && __notif_ctx.eval_capture)) \
__event_prepare_interpreter_stack__##_provider##___##_name(__stackvar.__interpreter_stack_data, \
_TP_ARGS_DATA_VAR(_args)); \
\
__event_notifier->notification_send(__event_notifier, \
- __stackvar.__interpreter_stack_data); \
+ __stackvar.__interpreter_stack_data, \
+ &__notif_ctx); \
break; \
} \
} \
projects / lttng-ust.git / blobdiff