X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event-reset.h;h=9a7ed708f98fb94538223a992cb05c37981e3be7;hb=1d188af9688feee0ec4e34038113a0edccddd4ea;hp=5acf5a1bd7babc2d5632e303a3c95e5ce2b5d9ce;hpb=612e9ce4e5cc3a1292522a563789f6aab6c421b1;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 5acf5a1b..9a7ed708 100644
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -24,22 +24,22 @@
 #undef LTTNG_UST_TRACEPOINT_LOGLEVEL
 #define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel)
 
-#undef TRACEPOINT_MODEL_EMF_URI
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
-#undef _ctf_integer_ext
-#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, \
+#undef lttng_ust__field_integer_ext
+#define lttng_ust__field_integer_ext(_type, _item, _src, _byte_order, _base, \
 			_nowrite)
 
-#undef _ctf_float
-#define _ctf_float(_type, _item, _src, _nowrite)
+#undef lttng_ust__field_float
+#define lttng_ust__field_float(_type, _item, _src, _nowrite)
 
-#undef _ctf_array_encoded
-#define _ctf_array_encoded(_type, _item, _src, _byte_order, _length, _encoding, \
+#undef lttng_ust__field_array_encoded
+#define lttng_ust__field_array_encoded(_type, _item, _src, _byte_order, _length, _encoding, \
 			_nowrite, _elem_type_base)
 
-#undef _ctf_sequence_encoded
-#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \
+#undef lttng_ust__field_sequence_encoded
+#define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \
 			_src_length, _encoding, _nowrite, _elem_type_base)
 
 #undef _ctf_string
@@ -52,50 +52,50 @@
 #define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)
 
 /* "write" */
-#undef ctf_integer
-#define ctf_integer(_type, _item, _src)
+#undef lttng_ust_field_integer
+#define lttng_ust_field_integer(_type, _item, _src)
 
-#undef ctf_integer_hex
-#define ctf_integer_hex(_type, _item, _src)
+#undef lttng_ust_field_integer_hex
+#define lttng_ust_field_integer_hex(_type, _item, _src)
 
-#undef ctf_integer_network
-#define ctf_integer_network(_type, _item, _src)
+#undef lttng_ust_field_integer_network
+#define lttng_ust_field_integer_network(_type, _item, _src)
 
-#undef ctf_integer_network_hex
-#define ctf_integer_network_hex(_type, _item, _src)
+#undef lttng_ust_field_integer_network_hex
+#define lttng_ust_field_integer_network_hex(_type, _item, _src)
 
-#undef ctf_float
-#define ctf_float(_type, _item, _src)
+#undef lttng_ust_field_float
+#define lttng_ust_field_float(_type, _item, _src)
 
-#undef ctf_array
-#define ctf_array(_type, _item, _src, _length)
+#undef lttng_ust_field_array
+#define lttng_ust_field_array(_type, _item, _src, _length)
 
-#undef ctf_array_hex
-#define ctf_array_hex(_type, _item, _src, _length)
+#undef lttng_ust_field_array_hex
+#define lttng_ust_field_array_hex(_type, _item, _src, _length)
 
-#undef ctf_array_network
-#define ctf_array_network(_type, _item, _src, _length)
+#undef lttng_ust_field_array_network
+#define lttng_ust_field_array_network(_type, _item, _src, _length)
 
-#undef ctf_array_network_hex
-#define ctf_array_network_hex(_type, _item, _src, _length)
+#undef lttng_ust_field_array_network_hex
+#define lttng_ust_field_array_network_hex(_type, _item, _src, _length)
 
-#undef ctf_array_text
-#define ctf_array_text(_type, _item, _src, _length)
+#undef lttng_ust_field_array_text
+#define lttng_ust_field_array_text(_type, _item, _src, _length)
 
-#undef ctf_sequence
-#define ctf_sequence(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence
+#define lttng_ust_field_sequence(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_hex
-#define ctf_sequence_hex(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_hex
+#define lttng_ust_field_sequence_hex(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_network
-#define ctf_sequence_network(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_network
+#define lttng_ust_field_sequence_network(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_network_hex
-#define ctf_sequence_network_hex(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_network_hex
+#define lttng_ust_field_sequence_network_hex(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_text
-#define ctf_sequence_text(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_text
+#define lttng_ust_field_sequence_text(_type, _item, _src, _length_type, _src_length)
 
 #undef ctf_string
 #define ctf_string(_item, _src)
@@ -107,41 +107,41 @@
 #define ctf_enum(_provider, _name, _type, _item, _src)
 
 /* "nowrite" */
-#undef ctf_integer_nowrite
-#define ctf_integer_nowrite(_type, _item, _src)
+#undef lttng_ust_field_integer_nowrite
+#define lttng_ust_field_integer_nowrite(_type, _item, _src)
 
-#undef ctf_float_nowrite
-#define ctf_float_nowrite(_type, _item, _src)
+#undef lttng_ust_field_float_nowrite
+#define lttng_ust_field_float_nowrite(_type, _item, _src)
 
-#undef ctf_array_nowrite
-#define ctf_array_nowrite(_type, _item, _src, _length)
+#undef lttng_ust_field_array_nowrite
+#define lttng_ust_field_array_nowrite(_type, _item, _src, _length)
 
-#undef ctf_array_nowrite_hex
-#define ctf_array_nowrite_hex(_type, _item, _src, _length)
+#undef lttng_ust_field_array_nowrite_hex
+#define lttng_ust_field_array_nowrite_hex(_type, _item, _src, _length)
 
-#undef ctf_array_network_nowrite
-#define ctf_array_network_nowrite(_type, _item, _src, _length)
+#undef lttng_ust_field_array_network_nowrite
+#define lttng_ust_field_array_network_nowrite(_type, _item, _src, _length)
 
-#undef ctf_array_network_nowrite_hex
-#define ctf_array_network_nowrite_hex(_type, _item, _src, _length)
+#undef lttng_ust_field_array_network_nowrite_hex
+#define lttng_ust_field_array_network_nowrite_hex(_type, _item, _src, _length)
 
-#undef ctf_array_text_nowrite
-#define ctf_array_text_nowrite(_type, _item, _src, _length)
+#undef lttng_ust_field_array_text_nowrite
+#define lttng_ust_field_array_text_nowrite(_type, _item, _src, _length)
 
-#undef ctf_sequence_nowrite
-#define ctf_sequence_nowrite(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_nowrite
+#define lttng_ust_field_sequence_nowrite(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_nowrite_hex
-#define ctf_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_nowrite_hex
+#define lttng_ust_field_sequence_nowrite_hex(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_network_nowrite
-#define ctf_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_network_nowrite
+#define lttng_ust_field_sequence_network_nowrite(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_network_nowrite_hex
-#define ctf_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_network_nowrite_hex
+#define lttng_ust_field_sequence_network_nowrite_hex(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_sequence_text_nowrite
-#define ctf_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length)
+#undef lttng_ust_field_sequence_text_nowrite
+#define lttng_ust_field_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length)
 
 #undef ctf_string_nowrite
 #define ctf_string_nowrite(_item, _src)