X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=be18e94c7823211b55b94b36fdca70bc97b7774e;hb=9b14815a9ee98c0dbc842a1e545cd6a82ae7b18a;hp=b10c42524eaf3aa7f22bed1d90cb78d75dc91e5c;hpb=b4064f282fc27c80f17166b1439442d6ddd118b2;p=lttng-ust.git

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index b10c4252..be18e94c 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _LTTNG_TRACEPOINT_H
-#define _LTTNG_TRACEPOINT_H
+#ifndef _LTTNG_UST_TRACEPOINT_H
+#define _LTTNG_UST_TRACEPOINT_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -586,20 +586,13 @@ lttng_ust__tracepoints__ptrs_destroy(void)
 #define do_tracepoint			lttng_ust_do_tracepoint
 #define tracepoint_enabled		lttng_ust_tracepoint_enabled
 #define TP_ARGS				LTTNG_UST_TP_ARGS
-#define TP_FIELDS			LTTNG_UST_TP_FIELDS
-
-#define ctf_integer			lttng_ust_field_integer
-#define ctf_integer_hex			lttng_ust_field_integer_hex
-#define ctf_integer_network		lttng_ust_field_integer_network
-#define ctf_integer_network_hex		lttng_ust_field_integer_network_hex
-#define ctf_integer_nowrite		lttng_ust_field_integer_nowrite
 #endif /* #if LTTNG_UST_COMPAT_API(0) */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _LTTNG_TRACEPOINT_H */
+#endif /* _LTTNG_UST_TRACEPOINT_H */
 
 /* The following declarations must be outside re-inclusion protection. */
 
@@ -616,18 +609,18 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *
  * LTTNG_UST_TRACEPOINT_ENUM(someproject_component, enumname,
  *	LTTNG_UST_TP_ENUM_VALUES(
- *		ctf_enum_value("even", 0)
- *		ctf_enum_value("uneven", 1)
- *		ctf_enum_range("twoto4", 2, 4)
- *		ctf_enum_value("five", 5)
+ *		lttng_ust_field_enum_value("even", 0)
+ *		lttng_ust_field_enum_value("uneven", 1)
+ *		lttng_ust_field_enum_range("twoto4", 2, 4)
+ *		lttng_ust_field_enum_value("five", 5)
  *	)
  * )
  *
  * Where "someproject_component" is the name of the component this enumeration
  * belongs to and "enumname" identifies this enumeration. Inside the
  * LTTNG_UST_TP_ENUM_VALUES macro is the actual mapping. Each string value can map
- * to either a single value with ctf_enum_value or a range of values
- * with ctf_enum_range.
+ * to either a single value with lttng_ust_field_enum_value or a range of values
+ * with lttng_ust_field_enum_range.
  *
  * Enumeration ranges may overlap, but the behavior is implementation-defined,
  * each trace reader will handle overlapping as it wishes.
@@ -635,7 +628,7 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  * That enumeration can then be used in a field inside the TP_FIELD macro using
  * the following line:
  *
- * ctf_enum(someproject_component, enumname, enumtype, enumfield, enumval)
+ * lttng_ust_field_enum(someproject_component, enumname, enumtype, enumfield, enumval)
  *
  * Where "someproject_component" and "enumname" match those in the
  * LTTNG_UST_TRACEPOINT_ENUM, "enumtype" is a signed or unsigned integer type
@@ -675,18 +668,18 @@ lttng_ust__tracepoints__ptrs_destroy(void)
  *         lttng_ust_field_integer_hex(unsigned long, field_d, arg1)
  *
  *         * Enumeration *
- *         ctf_enum(someproject_component, enum_name, int, field_e, arg0)
+ *         lttng_ust_field_enum(someproject_component, enum_name, int, field_e, arg0)
  *
  *         * Array Sequence, printed as UTF8-encoded array of bytes *
- *         ctf_array_text(char, field_b, string, FIXED_LEN)
- *         ctf_sequence_text(char, field_c, string, size_t, strlen)
+ *         lttng_ust_field_array_text(char, field_b, string, FIXED_LEN)
+ *         lttng_ust_field_sequence_text(char, field_c, string, size_t, strlen)
  *
  *         * String, printed as UTF8-encoded string *
- *         ctf_string(field_e, string)
+ *         lttng_ust_field_string(field_e, string)
  *
  *         * Array sequence of signed integer values *
- *         ctf_array(long, field_f, arg4, FIXED_LEN4)
- *         ctf_sequence(long, field_g, arg4, size_t, arg4_len)
+ *         lttng_ust_field_array(long, field_f, arg4, FIXED_LEN4)
+ *         lttng_ust_field_sequence(long, field_g, arg4, size_t, arg4_len)
  *     )
  * )
  *