X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event.h;h=22c97438ba589c3c66694abbe69b5be98f511fb8;hb=2792781482a58865c7504100d8c1ba6db41193d1;hp=9bf4eeadc1df9a6d581d4ddbc1bf05fa35ab6a43;hpb=e7bc0ef6c86ae97886cf5f8b28854cf281d4962b;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 9bf4eead..22c97438 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -11,6 +11,7 @@
 #include <urcu/rculist.h>
 #include <lttng/ust-events.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>
@@ -703,7 +704,10 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #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, \
@@ -714,8 +718,11 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 		__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)			        \
@@ -766,11 +773,11 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args))      \
 #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 */
 
@@ -796,6 +803,7 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 		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 */    \
@@ -821,20 +829,12 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 		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_UST_BYTECODE_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) {					      \
@@ -852,8 +852,6 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 		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);			      \
@@ -867,13 +865,18 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))	      \
 	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;							      \
 	}								      \
 	}								      \