X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event-write.h;h=66a7dede999dec0374f04d87bc7448c6e81d70ce;hb=891226fc4bda9655e54bbafabe7a2ae8923ba4e1;hp=a23cab6037b3ae781847edb76458d48f7fa48f56;hpb=4774c8f387042911d3256d29a06cfdbb8091bb10;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event-write.h b/include/lttng/ust-tracepoint-event-write.h
index a23cab60..66a7dede 100644
--- a/include/lttng/ust-tracepoint-event-write.h
+++ b/include/lttng/ust-tracepoint-event-write.h
@@ -1,55 +1,87 @@
 /*
- * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef ctf_integer
-#define ctf_integer(_type, _item, _src)				\
-	_ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, 1)
+#undef lttng_ust_field_integer
+#define lttng_ust_field_integer(_type, _item, _src)				\
+	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, 0)
 
-#undef ctf_integer_hex
-#define ctf_integer_hex(_type, _item, _src)			\
-	_ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 16, 1)
+#undef lttng_ust_field_integer_hex
+#define lttng_ust_field_integer_hex(_type, _item, _src)			\
+	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 16, 0)
 
-#undef ctf_integer_network
-#define ctf_integer_network(_type, _item, _src)			\
-	_ctf_integer_ext(_type, _item, _src, BIG_ENDIAN, 10, 1)
+#undef lttng_ust_field_integer_network
+#define lttng_ust_field_integer_network(_type, _item, _src)			\
+	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, 10, 0)
 
-#undef ctf_integer_network_hex
-#define ctf_integer_network_hex(_type, _item, _src)		\
-	_ctf_integer_ext(_type, _item, _src, BIG_ENDIAN, 16, 1)
+#undef lttng_ust_field_integer_network_hex
+#define lttng_ust_field_integer_network_hex(_type, _item, _src)		\
+	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BIG_ENDIAN, 16, 0)
 
-#undef ctf_float
-#define ctf_float(_type, _item, _src)				\
-	_ctf_float(_type, _item, _src, 1)
+#undef lttng_ust_field_float
+#define lttng_ust_field_float(_type, _item, _src)				\
+	lttng_ust__field_float(_type, _item, _src, 0)
 
 #undef ctf_array
 #define ctf_array(_type, _item, _src, _length)			\
-	_ctf_array_encoded(_type, _item, _src, _length, none, 1)
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length, none, 0, 10)
+
+#undef ctf_array_hex
+#define ctf_array_hex(_type, _item, _src, _length)		\
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length, none, 0, 16)
+
+#undef ctf_array_network
+#define ctf_array_network(_type, _item, _src, _length)	\
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length, none, 0, 10)
+
+#undef ctf_array_network_hex
+#define ctf_array_network_hex(_type, _item, _src, _length)	\
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length, none, 0, 16)
 
 #undef ctf_array_text
 #define ctf_array_text(_type, _item, _src, _length)		\
-	_ctf_array_encoded(_type, _item, _src, _length, UTF8, 1)
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length, UTF8, 0, 10)
 
 #undef ctf_sequence
 #define ctf_sequence(_type, _item, _src, _length_type, _src_length) \
-	_ctf_sequence_encoded(_type, _item, _src,		\
-			_length_type, _src_length, none, 1)
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length_type, _src_length, none, 0, 10)
+
+#undef ctf_sequence_hex
+#define ctf_sequence_hex(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length_type, _src_length, none, 0, 16)
+
+#undef ctf_sequence_network
+#define ctf_sequence_network(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length_type, _src_length, none, 0, 10)
+
+#undef ctf_sequence_network_hex
+#define ctf_sequence_network_hex(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length_type, _src_length, none, 0, 16)
 
 #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, 1)
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length_type, _src_length, UTF8, 0, 10)
 
 #undef ctf_string
 #define ctf_string(_item, _src)					\
-	_ctf_string(_item, _src, 1)
+	_ctf_string(_item, _src, 0)
+
+#undef ctf_unused
+#define ctf_unused(_src)					\
+	_ctf_unused(_src)
+
+#undef ctf_enum
+#define ctf_enum(_provider, _name, _type, _item, _src)			\
+	_ctf_enum(_provider, _name, _type, _item, _src, 0)