X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event-impl.h;h=38b1dc438366546e105e359154e9fc98aff01059;hb=0d1080f40a7ac09fce7120398746b1bfab3d32d8;hp=e3a858a397c5d49a8dfde63e97f5d61cf8e9b764;hpb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;p=lttng-modules.git

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index e3a858a3..38b1dc43 100644
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -839,10 +839,18 @@ static inline size_t __event_get_align__##_name(void *__tp_locvar)	      \
 
 #undef _ctf_array_encoded
 #define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _byte_order, _base, _user, _nowrite) \
-	if (_user) {							\
-		__chan->ops->event_write_from_user(&__ctx, _src, sizeof(_type) * (_length), lttng_alignof(_type)); \
-	} else {							\
-		__chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length), lttng_alignof(_type)); \
+	if (lttng_kernel_string_encoding_##_encoding == lttng_kernel_string_encoding_none) { \
+		if (_user) {								\
+			__chan->ops->event_write_from_user(&__ctx, _src, sizeof(_type) * (_length), lttng_alignof(_type)); \
+		} else {								\
+			__chan->ops->event_write(&__ctx, _src, sizeof(_type) * (_length), lttng_alignof(_type)); \
+		}									\
+	} else {									\
+		if (_user) {								\
+			__chan->ops->event_pstrcpy_pad_from_user(&__ctx, (const char __user *) (_src), _length); \
+		} else {								\
+			__chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), _length); \
+		}									\
 	}
 
 #if (__BYTE_ORDER == __LITTLE_ENDIAN)
@@ -893,18 +901,28 @@ static inline size_t __event_get_align__##_name(void *__tp_locvar)	      \
 #endif /* #else #if (__BYTE_ORDER == __LITTLE_ENDIAN) */
 
 #undef _ctf_sequence_encoded
-#define _ctf_sequence_encoded(_type, _item, _src, _length_type,		\
+#define _ctf_sequence_encoded(_type, _item, _src, _length_type,			\
 			_src_length, _encoding, _byte_order, _base, _user, _nowrite) \
-	{								\
+	{									\
 		_length_type __tmpl = this_cpu_ptr(&lttng_dynamic_len_stack)->stack[__dynamic_len_idx]; \
 		__chan->ops->event_write(&__ctx, &__tmpl, sizeof(_length_type), lttng_alignof(_length_type));\
-	}								\
-	if (_user) {							\
-		__chan->ops->event_write_from_user(&__ctx, _src,	\
-			sizeof(_type) * __get_dynamic_len(dest), lttng_alignof(_type));	\
-	} else {							\
-		__chan->ops->event_write(&__ctx, _src,			\
-			sizeof(_type) * __get_dynamic_len(dest), lttng_alignof(_type));	\
+	}									\
+	if (lttng_kernel_string_encoding_##_encoding == lttng_kernel_string_encoding_none) { \
+		if (_user) {							\
+			__chan->ops->event_write_from_user(&__ctx, _src,	\
+				sizeof(_type) * __get_dynamic_len(dest), lttng_alignof(_type));	\
+		} else {							\
+			__chan->ops->event_write(&__ctx, _src,			\
+				sizeof(_type) * __get_dynamic_len(dest), lttng_alignof(_type));	\
+		}								\
+	} else {								\
+		if (_user) {							\
+			__chan->ops->event_pstrcpy_pad_from_user(&__ctx, (const char __user *) (_src), \
+				__get_dynamic_len(dest));			\
+		} else {							\
+			__chan->ops->event_pstrcpy_pad(&__ctx, (const char *) (_src), \
+				__get_dynamic_len(dest));			\
+		}								\
 	}
 
 #if (__BYTE_ORDER == __LITTLE_ENDIAN)