X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2Flttng-events.h;h=1fab263dd2521631f0495f35164938fcbd4c4652;hb=refs%2Fheads%2Fstable-2.7;hp=adef299bbe4be84d48e5968cbc6417403bde3c40;hpb=76658350df530701b2d8adb1e84da75c05b2386b;p=lttng-modules.git

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index adef299b..1fab263d 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -31,6 +31,10 @@
 #include "../wrapper/rcu.h"
 #include "../lttng-events.h"
 #include "../lttng-tracer-core.h"
+#include <asm/byteorder.h>
+#include <linux/swab.h>
+
+#define __LTTNG_NULL_STRING	"(null)"
 
 /*
  * Macro declarations used for all stages.
@@ -331,7 +335,7 @@ static void __event_probe__##_name(void *__data);
 			max_t(size_t, lttng_strlen_user_inatomic(_src), 1);    \
 	else								       \
 		__event_len += __dynamic_len[__dynamic_len_idx++] =	       \
-			strlen(_src) + 1;
+			strlen((_src) ? (_src) : __LTTNG_NULL_STRING) + 1;
 
 #undef TP_PROTO
 #define TP_PROTO(...)	__VA_ARGS__
@@ -397,18 +401,24 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len,	      \
 		case 2:							       \
 		{							       \
 			union { _type t; int16_t v; } __tmp = { (_type) (_src) }; \
+			if (_byte_order != __BYTE_ORDER)		       \
+				__swab16s(&__tmp.v);			       \
 			__ctf_tmp_int64 = (int64_t) __tmp.v;		       \
 			break;						       \
 		}							       \
 		case 4:							       \
 		{							       \
 			union { _type t; int32_t v; } __tmp = { (_type) (_src) }; \
+			if (_byte_order != __BYTE_ORDER)		       \
+				__swab32s(&__tmp.v);			       \
 			__ctf_tmp_int64 = (int64_t) __tmp.v;		       \
 			break;						       \
 		}							       \
 		case 8:							       \
 		{							       \
 			union { _type t; int64_t v; } __tmp = { (_type) (_src) }; \
+			if (_byte_order != __BYTE_ORDER)		       \
+				__swab64s(&__tmp.v);			       \
 			__ctf_tmp_int64 = (int64_t) __tmp.v;		       \
 			break;						       \
 		}							       \
@@ -428,18 +438,24 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len,	      \
 		case 2:							       \
 		{							       \
 			union { _type t; uint16_t v; } __tmp = { (_type) (_src) }; \
+			if (_byte_order != __BYTE_ORDER)		       \
+				__swab16s(&__tmp.v);			       \
 			__ctf_tmp_uint64 = (uint64_t) __tmp.v;		       \
 			break;						       \
 		}							       \
 		case 4:							       \
 		{							       \
 			union { _type t; uint32_t v; } __tmp = { (_type) (_src) }; \
+			if (_byte_order != __BYTE_ORDER)		       \
+				__swab32s(&__tmp.v);			       \
 			__ctf_tmp_uint64 = (uint64_t) __tmp.v;		       \
 			break;						       \
 		}							       \
 		case 8:							       \
 		{							       \
 			union { _type t; uint64_t v; } __tmp = { (_type) (_src) }; \
+			if (_byte_order != __BYTE_ORDER)		       \
+				__swab64s(&__tmp.v);			       \
 			__ctf_tmp_uint64 = (uint64_t) __tmp.v;		       \
 			break;						       \
 		}							       \
@@ -497,7 +513,8 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len,	      \
 #undef _ctf_string
 #define _ctf_string(_item, _src, _user, _nowrite)			       \
 	{								       \
-		const void *__ctf_tmp_ptr = (_src);			       \
+		const void *__ctf_tmp_ptr =				       \
+			((_src) ? (_src) : __LTTNG_NULL_STRING);	       \
 		memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void *));	       \
 		__stack_data += sizeof(void *);				       \
 	}
@@ -663,12 +680,16 @@ static inline size_t __event_get_align__##_name(void *__tp_locvar)	      \
 
 #undef _ctf_string
 #define _ctf_string(_item, _src, _user, _nowrite)		        \
-	lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(*(_src)));	\
 	if (_user) {							\
+		lib_ring_buffer_align_ctx(&__ctx, lttng_alignof(*(_src))); \
 		__chan->ops->event_strcpy_from_user(&__ctx, _src,	\
 			__get_dynamic_len(dest));			\
 	} else {							\
-		__chan->ops->event_strcpy(&__ctx, _src,			\
+		const char *__ctf_tmp_string =				\
+			((_src) ? (_src) : __LTTNG_NULL_STRING);	\
+		lib_ring_buffer_align_ctx(&__ctx,			\
+			lttng_alignof(*__ctf_tmp_string));		\
+		__chan->ops->event_strcpy(&__ctx, __ctf_tmp_string,	\
 			__get_dynamic_len(dest));			\
 	}