Tracepoint API namespacing ctf_integer

[lttng-ust.git] / include / lttng / ust-tracepoint-event-reset.h

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index acc1207bc5ac6f28bc415004113a4d398c5d724e..fbac2944141c5c09c18e9b7174bedc8cd9b2c761 100644 (file)
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -4,34 +4,31 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-/* Define to "nothing" all macros used for TRACEPOINT_EVENT */
+/* Define to "nothing" all macros used for LTTNG_UST_TRACEPOINT_EVENT */
 
-#undef _TRACEPOINT_EVENT_CLASS
-#define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
+#undef LTTNG_UST__TRACEPOINT_EVENT_CLASS
+#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
 
-#undef _TRACEPOINT_EVENT_INSTANCE
-#define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
 
-#undef TRACEPOINT_ENUM
-#define TRACEPOINT_ENUM(_provider, _name, _values)
+#undef LTTNG_UST_TRACEPOINT_ENUM
+#define LTTNG_UST_TRACEPOINT_ENUM(_provider, _name, _values)
 
-#undef TP_ARGS
-#define TP_ARGS(...)
+#undef LTTNG_UST_TP_ARGS
+#define LTTNG_UST_TP_ARGS(...)
 
-#undef TP_FIELDS
-#define TP_FIELDS(...)
+#undef LTTNG_UST_TP_FIELDS
+#define LTTNG_UST_TP_FIELDS(...)
 
-#undef  TRACEPOINT_LOGLEVEL_ENUM
-#define TRACEPOINT_LOGLEVEL_ENUM(...)
+#undef LTTNG_UST_TRACEPOINT_LOGLEVEL
+#define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel)
 
-#undef TRACEPOINT_LOGLEVEL
-#define TRACEPOINT_LOGLEVEL(provider, name, loglevel)
+#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
-#undef TRACEPOINT_MODEL_EMF_URI
-#define 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
@@ -48,21 +45,24 @@
 #undef _ctf_string
 #define _ctf_string(_item, _src, _nowrite)
 
+#undef _ctf_unused
+#define _ctf_unused(_src)
+
 #undef _ctf_enum
 #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)
@@ -100,12 +100,15 @@
 #undef ctf_string
 #define ctf_string(_item, _src)
 
+#undef ctf_unused
+#define ctf_unused(_src)
+
 #undef ctf_enum
 #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)
@@ -143,5 +146,8 @@
 #undef ctf_string_nowrite
 #define ctf_string_nowrite(_item, _src)
 
+#undef ctf_unused_nowrite
+#define ctf_unused_nowrite(_src)
+
 #undef ctf_enum_nowrite
 #define ctf_enum_nowrite(_provider, _name, _type, _item, _src)