X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-events.h;h=084666d56514520f7db875e6026bf538eef0cfbd;hb=4ea00e4f764eb18686121161a98e4ef442fed2c0;hp=63bde18533a713df3d939ebbd98607e17861d64c;hpb=25631135724387849b45eaed70d75e072c29e2f5;p=lttng-modules.git

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 63bde185..084666d5 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.
  *
@@ -508,6 +510,27 @@ __assign_##dest##_2:							\
 	__chan->ops->event_write(&__ctx, src,				\
 		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;
+/*
+ * tp_copy_string_from_user "len" parameter is the length of the string
+ * excluding the final \0.
+ */
+#undef tp_copy_string_from_user
+#define tp_copy_string_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);		\
+	__chan->ops->event_memset(&__ctx, 0, 1);			\
+	goto __end_field_##dest;
 
 #undef tp_strcpy
 #define tp_strcpy(dest, src)						\
@@ -642,3 +665,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