X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-events-write.h;h=87741a17752ccc30ad0845abe9121a9149275003;hb=6570d49986487c451ae120851001abcf1efc70f7;hp=aed0814bb2dc8afbe8cd3fb8dceaccdf4cff9374;hpb=af2a1fe5297bbbcb6ab5ba9a5275b3546c38ff10;p=lttng-modules.git

diff --git a/probes/lttng-events-write.h b/probes/lttng-events-write.h
index aed0814b..87741a17 100644
--- a/probes/lttng-events-write.h
+++ b/probes/lttng-events-write.h
@@ -22,6 +22,10 @@
 #define ctf_integer(_type, _item, _src)				\
 	_ctf_integer_ext(_type, _item, _src, __BYTE_ORDER, 10, 0, 0)
 
+#undef ctf_integer_bitfield
+#define ctf_integer_bitfield(_type, _item, _src)			\
+	_ctf_integer_ext(_type, _item, _src, __LITTLE_ENDIAN, 10, 0, 0)
+
 #undef ctf_integer_hex
 #define ctf_integer_hex(_type, _item, _src)			\
 	_ctf_integer_ext(_type, _item, _src, __BYTE_ORDER, 16, 0, 0)
@@ -46,6 +50,10 @@
 #define ctf_array_text(_type, _item, _src, _length)		\
 	_ctf_array_encoded(_type, _item, _src, _length, UTF8, 0, 0)
 
+#undef ctf_array_bitfield
+#define ctf_array_bitfield(_type, _item, _src, _length)		\
+	_ctf_array_bitfield(_type, _item, _src, _length, 0, 0)
+
 #undef ctf_sequence
 #define ctf_sequence(_type, _item, _src, _length_type, _src_length) \
 	_ctf_sequence_encoded(_type, _item, _src,		\
@@ -64,12 +72,21 @@
 #undef ctf_sequence_text
 #define ctf_sequence_text(_type, _item, _src, _length_type, _src_length) \
 	_ctf_sequence_encoded(_type, _item, _src,		\
-			_length_type, _src_length, UTF8, __BYTE_ORDER, 0, 0, 0)
+			_length_type, _src_length, UTF8, __BYTE_ORDER, 10, 0, 0)
+
+#undef ctf_sequence_bitfield
+#define ctf_sequence_bitfield(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_bitfield(_type, _item, _src,		\
+			_length_type, _src_length, 0, 0)
 
 #undef ctf_string
 #define ctf_string(_item, _src)					\
 	_ctf_string(_item, _src, 0, 0)
 
+#undef ctf_enum
+#define ctf_enum(_name, _type, _item, _src)			\
+	_ctf_enum(_name, _type, _item, _src, 0, 0)
+
 /* user src */
 #undef ctf_user_integer
 #define ctf_user_integer(_type, _item, _src)				\
@@ -95,6 +112,10 @@
 #define ctf_user_array_text(_type, _item, _src, _length)		\
 	_ctf_array_encoded(_type, _item, _src, _length, UTF8, 1, 0)
 
+#undef ctf_user_array_bitfield
+#define ctf_user_array_bitfield(_type, _item, _src, _length)		\
+	_ctf_array_bitfield(_type, _item, _src, _length, 1, 0)
+
 #undef ctf_user_sequence
 #define ctf_user_sequence(_type, _item, _src, _length_type, _src_length) \
 	_ctf_sequence_encoded(_type, _item, _src,		\
@@ -108,8 +129,143 @@
 #undef ctf_user_sequence_text
 #define ctf_user_sequence_text(_type, _item, _src, _length_type, _src_length) \
 	_ctf_sequence_encoded(_type, _item, _src,		\
-			_length_type, _src_length, UTF8, __BYTE_ORDER, 0, 1, 0)
+			_length_type, _src_length, UTF8, __BYTE_ORDER, 10, 1, 0)
+
+#undef ctf_user_sequence_bitfield
+#define ctf_user_sequence_bitfield(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_bitfield(_type, _item, _src,		\
+			_length_type, _src_length, 1, 0)
 
 #undef ctf_user_string
 #define ctf_user_string(_item, _src)					\
 	_ctf_string(_item, _src, 1, 0)
+
+#undef ctf_user_enum
+#define ctf_user_enum(_name, _type, _item, _src)			\
+	_ctf_enum(_name, _type, _item, _src, 1, 0)
+
+/* types */
+#undef ctf_integer_type
+#define ctf_integer_type(_type, _src)					\
+	ctf_integer(_type, unused, _src)
+
+#undef ctf_integer_bitfield_type
+#define ctf_integer_bitfield_type(_type, _src)				\
+	ctf_integer_bitfield(_type, unused, _src)
+
+#undef ctf_integer_hex_type
+#define ctf_integer_hex_type(_type, _src)				\
+	ctf_integer_hex(_type, unused, _src)
+
+#undef ctf_integer_oct_type
+#define ctf_integer_oct_type(_type, _item, _src)			\
+	ctf_integer_oct(_type, unused, _src)
+
+#undef ctf_integer_network_type
+#define ctf_integer_network_type(_type, _src)				\
+	ctf_integer_network(_type, unused, _src)
+
+#undef ctf_integer_network_hex_type
+#define ctf_integer_network_hex_type(_type, _src)			\
+	ctf_integer_network_hex(_type, unused, _src)
+
+#undef ctf_array_type
+#define ctf_array_type(_type, _src, _length)				\
+	ctf_array(_type, unused, _src, _length)
+
+#undef ctf_array_text_type
+#define ctf_array_text_type(_type, _src, _length)			\
+	ctf_array_text(_type, unused, _src, _length)
+
+#undef ctf_array_bitfield_type
+#define ctf_array_bitfield_type(_type, _src, _length)			\
+	ctf_array_bitfield(_type, unused, _src, _length)
+
+#undef ctf_sequence_type
+#define ctf_sequence_type(_type, _src, _length_type, _src_length) \
+	ctf_sequence(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_sequence_hex_type
+#define ctf_sequence_hex_type(_type, _src, _length_type, _src_length) \
+	ctf_sequence_hex(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_sequence_network_type
+#define ctf_sequence_network_type(_type, _src, _length_type, _src_length) \
+	ctf_sequence_network(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_sequence_text_type
+#define ctf_sequence_text_type(_type, _src, _length_type, _src_length) \
+	ctf_sequence_text(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_sequence_bitfield_type
+#define ctf_sequence_bitfield_type(_type, _src, _length_type, _src_length) \
+	ctf_sequence_bitfield(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_string_type
+#define ctf_string_type(_src)						\
+	ctf_string(unused, _src)
+
+#undef ctf_enum_type
+#define ctf_enum_type(_name, _type, _src)				\
+	ctf_enum(_name, _type, unused, _src)
+
+/* user src types */
+#undef ctf_user_integer_type
+#define ctf_user_integer_type(_type, _src)				\
+	ctf_user_integer(_type, unused, _src)
+
+#undef ctf_user_integer_hex_type
+#define ctf_user_integer_hex_type(_type, _src)				\
+	ctf_user_integer_hex(_type, unused, _src)
+
+#undef ctf_user_integer_oct_type
+#define ctf_user_integer_oct_type(_type, _item, _src)			\
+	ctf_user_integer_oct(_type, unused, _src)
+
+#undef ctf_user_integer_network_type
+#define ctf_user_integer_network_type(_type, _src)			\
+	ctf_user_integer_network(_type, unused, _src)
+
+#undef ctf_user_integer_network_hex_type
+#define ctf_user_integer_network_hex_type(_type, _src)			\
+	ctf_user_integer_network_hex(_type, unused, _src)
+
+#undef ctf_user_array_type
+#define ctf_user_array_type(_type, _src, _length)			\
+	ctf_user_array(_type, unused, _src, _length)
+
+#undef ctf_user_array_text_type
+#define ctf_user_array_text_type(_type, _src, _length)			\
+	ctf_user_array_text(_type, unused, _src, _length)
+
+#undef ctf_user_array_bitfield_type
+#define ctf_user_array_bitfield_type(_type, _src, _length)		\
+	ctf_user_array_bitfield(_type, unused, _src, _length)
+
+#undef ctf_user_sequence_type
+#define ctf_user_sequence_type(_type, _src, _length_type, _src_length) \
+	ctf_user_sequence(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_user_sequence_hex_type
+#define ctf_user_sequence_hex_type(_type, _src, _length_type, _src_length) \
+	ctf_user_sequence_hex(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_user_sequence_network_type
+#define ctf_user_sequence_network_type(_type, _src, _length_type, _src_length) \
+	ctf_user_sequence_network(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_user_sequence_text_type
+#define ctf_user_sequence_text_type(_type, _src, _length_type, _src_length) \
+	ctf_user_sequence_text(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_user_sequence_bitfield_type
+#define ctf_user_sequence_bitfield_type(_type, _src, _length_type, _src_length) \
+	ctf_user_sequence_bitfield(_type, unused, _src, _length_type, _src_length)
+
+#undef ctf_user_string_type
+#define ctf_user_string_type(_src)					\
+	ctf_user_string(unused, _src)
+
+#undef ctf_user_enum_type
+#define ctf_user_enum_type(_name, _type, _src)				\
+	ctf_user_enum(_name, _type, unused, _src)