X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event-nowrite.h;h=9358d8f115a3d838746e60f7fa146cb6d554ac52;hb=891226fc4bda9655e54bbafabe7a2ae8923ba4e1;hp=98d97919a2f69efd47f49dd67446a399dae69f1f;hpb=d2428e875af8666473fb689429eaf1022862510d;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event-nowrite.h b/include/lttng/ust-tracepoint-event-nowrite.h
index 98d97919..9358d8f1 100644
--- a/include/lttng/ust-tracepoint-event-nowrite.h
+++ b/include/lttng/ust-tracepoint-event-nowrite.h
@@ -1,51 +1,72 @@
 /*
- * 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.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef ctf_integer_nowrite
-#define ctf_integer_nowrite(_type, _item, _src)			\
-	_ctf_integer_ext(_type, _item, _src, BYTE_ORDER, 10, 1)
+#undef lttng_ust_field_integer_nowrite
+#define lttng_ust_field_integer_nowrite(_type, _item, _src)			\
+	lttng_ust__field_integer_ext(_type, _item, _src, LTTNG_UST_BYTE_ORDER, 10, 1)
 
-#undef ctf_float_nowrite
-#define ctf_float_nowrite(_type, _item, _src)			\
-	_ctf_float(_type, _item, _src, 1)
+#undef lttng_ust_field_float_nowrite
+#define lttng_ust_field_float_nowrite(_type, _item, _src)			\
+	lttng_ust__field_float(_type, _item, _src, 1)
 
 #undef ctf_array_nowrite
 #define ctf_array_nowrite(_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, 1, 10)
+
+#undef ctf_array_nowrite_hex
+#define ctf_array_nowrite_hex(_type, _item, _src, _length)	\
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER, _length, none, 1, 16)
+
+#undef ctf_array_network_nowrite
+#define ctf_array_network_nowrite(_type, _item, _src, _length)	\
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length, none, 1, 10)
+
+#undef ctf_array_network_nowrite_hex
+#define ctf_array_network_nowrite_hex(_type, _item, _src, _length) \
+	_ctf_array_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length, none, 1, 16)
 
 #undef ctf_array_text_nowrite
 #define ctf_array_text_nowrite(_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, 1, 10)
 
 #undef ctf_sequence_nowrite
 #define ctf_sequence_nowrite(_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, 1, 10)
+
+#undef ctf_sequence_nowrite_hex
+#define ctf_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BYTE_ORDER,	\
+			_length_type, _src_length, none, 1, 16)
+
+#undef ctf_sequence_network_nowrite
+#define ctf_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length_type, _src_length, none, 1, 10)
+
+#undef ctf_sequence_network_nowrite_hex
+#define ctf_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length) \
+	_ctf_sequence_encoded(_type, _item, _src, LTTNG_UST_BIG_ENDIAN,	\
+			_length_type, _src_length, none, 1, 16)
 
 #undef ctf_sequence_text_nowrite
 #define ctf_sequence_text_nowrite(_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, 1, 10)
 
 #undef ctf_string_nowrite
 #define ctf_string_nowrite(_item, _src)				\
 	_ctf_string(_item, _src, 1)
+
+#undef ctf_unused_nowrite
+#define ctf_unused_nowrite(_src)				\
+	_ctf_unused(_src)
+
+#undef ctf_enum_nowrite
+#define ctf_enum_nowrite(_provider, _name, _type, _item, _src)		\
+	_ctf_enum(_provider, _name, _type, _item, _src, 1)