X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-events.h;h=219f63e6a7fcb01e5d1862c6d8e83f7f33b1ff00;hb=58aa5d24fc1b9bc14fa91a2a9ca8467fb2541fec;hp=022b4a8312d2363e818ac7eb6628831d467e3e4a;hpb=f7bdf4db0b992946342dc845c7369e9cdca46559;p=lttng-modules.git

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 022b4a83..219f63e6 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -111,6 +111,10 @@ void trace_##_name(void *__data);
 #define __field_ext(_type, _item, _filter_type)			\
 	__field(_type, _item)
 
+#undef __field_hex
+#define __field_hex(_type, _item)				\
+	__field_full(_type, _item, __BYTE_ORDER, 16)
+
 #undef __field_network
 #define __field_network(_type, _item)				\
 	__field_full(_type, _item, __BIG_ENDIAN, 10)
@@ -200,8 +204,6 @@ void trace_##_name(void *__data);
 
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
-#undef __type_integer
-
 /*
  * Stage 3 of the trace events.
  *
@@ -293,7 +295,7 @@ static const struct lttng_event_desc *TP_ID(__event_desc___, TRACE_SYSTEM)[] = {
 #define TP_ID(_token, _system)	TP_ID1(_token, _system)
 
 /* non-const because list head will be modified when registered. */
-static struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
+static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = {
 	.event_desc = TP_ID(__event_desc___, TRACE_SYSTEM),
 	.nr_events = ARRAY_SIZE(TP_ID(__event_desc___, TRACE_SYSTEM)),
 };
@@ -509,6 +511,26 @@ __assign_##dest##_2:							\
 		sizeof(__typemap.dest) * __get_dynamic_array_len(dest));\
 	goto __end_field_##dest##_2;
 
+#undef tp_memcpy_from_user
+#define tp_memcpy_from_user(dest, src, len)				\
+	__assign_##dest:						\
+	if (0)								\
+		(void) __typemap.dest;					\
+	lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__typemap.dest));	\
+	__chan->ops->event_write_from_user(&__ctx, src, len);		\
+	goto __end_field_##dest;
+
+#undef tp_copy_string_from_user
+#define tp_copy_string_from_user(dest, src)				\
+	__assign_##dest:						\
+	if (0)								\
+		(void) __typemap.dest;					\
+	lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__typemap.dest));	\
+	__chan->ops->event_write_from_user(&__ctx, src,			\
+		__get_dynamic_array_len(dest) - 1);			\
+	__chan->ops->event_memset(&__ctx, 0, 1);			\
+	goto __end_field_##dest;
+
 #undef tp_strcpy
 #define tp_strcpy(dest, src)						\
 	tp_memcpy(dest, src, __get_dynamic_array_len(dest))
@@ -642,3 +664,7 @@ module_exit_eval(__lttng_events_exit__, TRACE_SYSTEM);
 #undef module_exit_eval
 #undef TP_ID1
 #undef TP_ID
+
+#undef TP_PROTO
+#undef TP_ARGS
+#undef TRACE_EVENT_FLAGS