X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Flttng-tracepoint-event.h;h=1642cf180c1356424a6aab8771b899574abfd77a;hb=a5fd9b038fa5034ade759ca1338d2b93153ba217;hp=010a54dc01565c71594a8e69118c647ee5438904;hpb=41aaf8a5de3c7c3570e0fe063f1565385b4a4dbd;p=lttng-ust.git

diff --git a/include/ust/lttng-tracepoint-event.h b/include/ust/lttng-tracepoint-event.h
index 010a54dc..1642cf18 100644
--- a/include/ust/lttng-tracepoint-event.h
+++ b/include/ust/lttng-tracepoint-event.h
@@ -43,6 +43,8 @@
 #define ctf_integer_network_hex(_type, _item, _src)		\
 	ctf_integer_ext(_type, _item, _src, BIG_ENDIAN, 16)
 
+/* ctf_float is redefined at each step */
+
 #undef ctf_array
 #define ctf_array(_type, _item, _src, _length)			\
 	ctf_array_encoded(_type, _item, _src, _length, none)
@@ -289,7 +291,7 @@ static struct lttng_probe_desc TP_ID(__probe_desc___, TRACEPOINT_SYSTEM) = {
 	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_length_type));   \
 	__event_len += sizeof(_length_type);				       \
 	__event_len += lib_ring_buffer_align(__event_len, lttng_alignof(_type)); \
-	__dynamic_len[__dynamic_len_idx] = (_length);			       \
+	__dynamic_len[__dynamic_len_idx] = (_src_length);		       \
 	__event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx];       \
 	__dynamic_len_idx++;
 
@@ -430,20 +432,21 @@ static inline size_t __event_get_align__##_name(void)			      \
 			_src_length, _encoding)			\
 	{								\
 		_length_type __tmpl = __dynamic_len[__dynamic_len_idx];	\
-		lib_ring_buffer_align_ctx(&ctx, lttng_alignof(_length_type));    \
+		lib_ring_buffer_align_ctx(&ctx, lttng_alignof(_length_type));  \
 		__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_sequence_len(dest));
+		sizeof(_type) * __get_dynamic_len(dest));
 
 #undef ctf_string
 #define ctf_string(_item, _src)					        \
-	tp_memcpy(dest, _src, __get_sequence_len(dest))
+	lib_ring_buffer_align_ctx(&ctx, lttng_alignof(*(_src)));	\
+	__chan->ops->event_write(&ctx, _src, __get_dynamic_len(dest));
 
 /* Beware: this get len actually consumes the len value */
-#undef __get_sequence_len
-#define __get_sequence_len(field)	__dynamic_len[__dynamic_len_idx++]
+#undef __get_dynamic_len
+#define __get_dynamic_len(field)	__dynamic_len[__dynamic_len_idx++]
 
 #undef TP_PROTO
 #define TP_PROTO(args...) args
@@ -477,7 +480,7 @@ static void __event_probe__##_name(void *__data, _proto)		      \
 	__event_len = __event_get_size__##_name(__dynamic_len, _args);	      \
 	__event_align = __event_get_align__##_name(_args);		      \
 	lib_ring_buffer_ctx_init(&ctx, __chan->chan, __event, __event_len,    \
-				 __event_align, -1);			      \
+				 __event_align, -1, __chan->handle);	      \
 	__ret = __chan->ops->event_reserve(&ctx, __event->id);		      \
 	if (__ret < 0)							      \
 		return;							      \
@@ -508,7 +511,7 @@ static void __event_probe__##_name(void *__data)			      \
 	__event_len = __event_get_size__##_name(__dynamic_len);		      \
 	__event_align = __event_get_align__##_name();			      \
 	lib_ring_buffer_ctx_init(&ctx, __chan->chan, __event, __event_len,    \
-				 __event_align, -1);			      \
+				 __event_align, -1, __chan->handle);	      \
 	__ret = __chan->ops->event_reserve(&ctx, __event->id);		      \
 	if (__ret < 0)							      \
 		return;							      \
@@ -518,6 +521,8 @@ static void __event_probe__##_name(void *__data)			      \
 
 #include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE)
 
+#undef __get_dynamic_len
+
 /*
  * Stage 8 of the trace events.
  *