X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=include%2Flttng%2Ftracepoint-event-impl.h;h=5af11ba746820abd6cc8bae274de3a67cd1cd36d;hb=8a44545778a66f5c473b348ff0231145d59e1d21;hp=f23c2677a42795b21f0098d464c5accb93a0308f;hpb=e2d5dbc7d09c7aa4f7c391fcdd4dfc95ba1ed326;p=lttng-modules.git

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index f23c2677..5af11ba7 100644
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -1068,20 +1068,11 @@ static void __event_probe__##_name(_data_proto)						\
 	__dynamic_len_idx = __orig_dynamic_len_offset;					\
 	_code_pre									\
 	if (unlikely(READ_ONCE(__event->eval_filter))) {				\
-		struct lttng_bytecode_runtime *bc_runtime;				\
-		bool __filter_record = false;						\
-											\
 		__event_prepare_interpreter_stack__##_name(__stackvar.__interpreter_stack_data, \
 				_locvar_args);						\
 		__interpreter_stack_prepared = true;					\
-		lttng_list_for_each_entry_rcu(bc_runtime, &__event->priv->filter_bytecode_runtime_head, node) { \
-			if (unlikely(bc_runtime->interpreter_funcs.filter(bc_runtime, &__lttng_probe_ctx, \
-					__stackvar.__interpreter_stack_data) & LTTNG_INTERPRETER_RECORD_FLAG)) { \
-				__filter_record = true;					\
-				break;							\
-			}								\
-		}									\
-		if (likely(!__filter_record))						\
+		if (likely(__event->run_filter(__event,			      		\
+				__stackvar.__interpreter_stack_data, &__lttng_probe_ctx, NULL) != LTTNG_KERNEL_EVENT_FILTER_ACCEPT)) \
 			goto __post;							\
 	}										\
 	switch (__event->type) {							\
@@ -1101,8 +1092,8 @@ static void __event_probe__##_name(_data_proto)						\
 			goto __post;							\
 		}									\
 		__event_align = __event_get_align__##_name(_locvar_args);		\
-		lib_ring_buffer_ctx_init(&__ctx, __chan->chan, &__lttng_probe_ctx, __event_len, \
-					 __event_align, -1);				\
+		lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event_len,		\
+					 __event_align, -1, &__lttng_probe_ctx);	\
 		__ret = __chan->ops->event_reserve(&__ctx, __event_recorder->priv->id);	\
 		if (__ret < 0)								\
 			goto __post;							\
@@ -1123,8 +1114,8 @@ static void __event_probe__##_name(_data_proto)						\
 					_locvar_args);					\
 											\
 		__event_notifier->notification_send(__event_notifier,			\
-				&__lttng_probe_ctx,					\
 				__stackvar.__interpreter_stack_data,			\
+				&__lttng_probe_ctx,					\
 				&__notif_ctx);						\
 		break;									\
 	}										\