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

diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h
index 5af11ba7..e7eb31f1 100644
--- a/include/lttng/tracepoint-event-impl.h
+++ b/include/lttng/tracepoint-event-impl.h
@@ -20,7 +20,6 @@
 #include <lttng/types.h>
 #include <lttng/probe-user.h>
 #include <lttng/events.h>
-#include <lttng/events-internal.h>	/* TODO: remove this include after refactoring is done. */
 #include <lttng/tracer-core.h>
 #include <lttng/tp-mempool.h>
 
@@ -252,7 +251,7 @@ void __event_template_proto___##_name(void);
 		lttng_kernel_static_type_integer_from_type(_length_type, __BYTE_ORDER, 10), \
 		_nowrite, 0, 1),				\
 	lttng_kernel_static_event_field(#_item,			\
-		lttng_kernel_static_type_sequence("_" #_item "_length", \
+		lttng_kernel_static_type_sequence(NULL,	/* Use previous field. */ \
 			lttng_kernel_static_type_integer_from_type(_type, _byte_order, _elem_type_base), \
 			0,					\
 			_encoding),				\
@@ -266,7 +265,7 @@ void __event_template_proto___##_name(void);
 		lttng_kernel_static_type_integer_from_type(_length_type, __BYTE_ORDER, 10), \
 		_nowrite, 0, 1),				\
 	lttng_kernel_static_event_field(#_item,			\
-		lttng_kernel_static_type_sequence("_" #_item "_length", \
+		lttng_kernel_static_type_sequence(NULL,	/* Use previous field. */ \
 			lttng_kernel_static_type_integer(1, 1, 0, __LITTLE_ENDIAN, 10), \
 			lttng_alignof(_type),			\
 			none),					\
@@ -1004,7 +1003,7 @@ static void __event_probe__##_name(_data_proto)						\
 {											\
 	struct probe_local_vars { _locvar };						\
 	struct lttng_kernel_event_common *__event = __data;				\
-	struct lttng_probe_ctx __lttng_probe_ctx = {					\
+	struct lttng_kernel_probe_ctx __lttng_probe_ctx = {				\
 		.event = __event,							\
 		.interruptible = !irqs_disabled(),					\
 	};										\
@@ -1092,9 +1091,9 @@ 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, __event_len,		\
-					 __event_align, -1, &__lttng_probe_ctx);	\
-		__ret = __chan->ops->event_reserve(&__ctx, __event_recorder->priv->id);	\
+		lib_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len,		\
+					 __event_align, &__lttng_probe_ctx);		\
+		__ret = __chan->ops->event_reserve(&__ctx);				\
 		if (__ret < 0)								\
 			goto __post;							\
 		_fields									\