X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-events.h;h=a6c36b088dfba22ab12a7cf162c7880087dff578;hb=13edcd1d9b0b5df38312bbfd02b7d70b8fbb0702;hp=29b44af71d9316b0701adfba64dc4312c3c403e7;hpb=d0558de29ca516e83b388b8028651f8b69288e4e;p=lttng-modules.git

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 29b44af7..a6c36b08 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -27,6 +27,7 @@
 #include "lttng-probe-user.h"
 #include "../wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
 #include "../wrapper/ringbuffer/frontend_types.h"
+#include "../wrapper/rcu.h"
 #include "../lttng-events.h"
 #include "../lttng-tracer-core.h"
 
@@ -326,10 +327,10 @@ static void __event_probe__##_name(void *__data);
 #define _ctf_string(_item, _src, _user, _nowrite)			       \
 	if (_user)							       \
 		__event_len += __dynamic_len[__dynamic_len_idx++] =	       \
-			strlen(_src) + 1;				       \
+			max_t(size_t, lttng_strlen_user_inatomic(_src), 1);    \
 	else								       \
 		__event_len += __dynamic_len[__dynamic_len_idx++] =	       \
-			max_t(size_t, lttng_strlen_user_inatomic(_src), 1);
+			strlen(_src) + 1;
 
 #undef TP_PROTO
 #define TP_PROTO(...)	__VA_ARGS__
@@ -728,7 +729,7 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 		return;							      \
 	if (unlikely(!ACCESS_ONCE(__event->enabled)))			      \
 		return;							      \
-	__lpf = rcu_dereference(__session->pid_tracker);		      \
+	__lpf = lttng_rcu_dereference(__session->pid_tracker);		      \
 	if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid)))  \
 		return;							      \
 	_code								      \
@@ -738,7 +739,7 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 									      \
 		__event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \
 				tp_locvar, _args);				      \
-		list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
+		lttng_list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
 			if (unlikely(bc_runtime->filter(bc_runtime,	      \
 					__stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
 				__filter_record = 1;			      \
@@ -787,7 +788,7 @@ static void __event_probe__##_name(void *__data)			      \
 		return;							      \
 	if (unlikely(!ACCESS_ONCE(__event->enabled)))			      \
 		return;							      \
-	__lpf = rcu_dereference(__session->pid_tracker);		      \
+	__lpf = lttng_rcu_dereference(__session->pid_tracker);		      \
 	if (__lpf && likely(!lttng_pid_tracker_lookup(__lpf, current->pid)))  \
 		return;							      \
 	_code								      \
@@ -797,7 +798,7 @@ static void __event_probe__##_name(void *__data)			      \
 									      \
 		__event_prepare_filter_stack__##_name(__stackvar.__filter_stack_data, \
 				tp_locvar);				      \
-		list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
+		lttng_list_for_each_entry_rcu(bc_runtime, &__event->bytecode_runtime_head, node) { \
 			if (unlikely(bc_runtime->filter(bc_runtime,	      \
 					__stackvar.__filter_stack_data) & LTTNG_FILTER_RECORD_FLAG)) \
 				__filter_record = 1;			      \