Tracepoint API namespacing 'TP_ARGS'

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

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 98c3c8dd89bfd2b6419bca7f6e15b255967209aa..269bb2b23ecc8e369a7da1167b34e143ab621572 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -19,6 +19,7 @@
 #include <lttng/ust-config.h>  /* for sdt */
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-tracer.h>
+#include <lttng/ust-api-compat.h>
 
 #define LTTNG_UST_TRACEPOINT_NAME_LEN_MAX      256
 
@@ -49,23 +50,23 @@
 extern "C" {
 #endif
 
-#define tracepoint_enabled(provider, name) \
+#define lttng_ust_tracepoint_enabled(provider, name)                           \
        caa_unlikely(CMM_LOAD_SHARED(__tracepoint_##provider##___##name.state))
 
-#define do_tracepoint(provider, name, ...) \
+#define lttng_ust_do_tracepoint(provider, name, ...)                           \
        __tracepoint_cb_##provider##___##name(__VA_ARGS__)
 
-#define tracepoint(provider, name, ...)                                            \
-       do {                                                                \
-               LTTNG_UST_STAP_PROBEV(provider, name, ## __VA_ARGS__);      \
-               if (tracepoint_enabled(provider, name))                     \
-                       do_tracepoint(provider, name, __VA_ARGS__);         \
+#define lttng_ust_tracepoint(provider, name, ...)                              \
+       do {                                                                    \
+               LTTNG_UST_STAP_PROBEV(provider, name, ## __VA_ARGS__);          \
+               if (lttng_ust_tracepoint_enabled(provider, name))               \
+                       lttng_ust_do_tracepoint(provider, name, __VA_ARGS__);   \
        } while (0)
 
-#define TP_ARGS(...)       __VA_ARGS__
+#define LTTNG_UST_TP_ARGS(...)       __VA_ARGS__
 
 /*
- * TP_ARGS takes tuples of type, argument separated by a comma.
+ * LTTNG_UST_TP_ARGS takes tuples of type, argument separated by a comma.
  * It can take up to 10 tuples (which means that less than 10 tuples is
  * fine too).
  * Each tuple is also separated by a comma.
@@ -567,6 +568,13 @@ __tracepoints__ptrs_destroy(void)
 
 #endif /* #else TRACEPOINT_DEFINE */
 
+#if LTTNG_UST_COMPAT_API(0)
+#define tracepoint                     lttng_ust_tracepoint
+#define do_tracepoint                  lttng_ust_do_tracepoint
+#define tracepoint_enabled             lttng_ust_tracepoint_enabled
+#define TP_ARGS                                LTTNG_UST_TP_ARGS
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
 #ifdef __cplusplus
 }
 #endif
@@ -628,9 +636,9 @@ __tracepoints__ptrs_destroy(void)
  *
  * TRACEPOINT_EVENT(someproject_component, event_name,
  *
- *     * TP_ARGS takes from 0 to 10 "type, field_name" pairs *
+ *     * LTTNG_UST_TP_ARGS takes from 0 to 10 "type, field_name" pairs *
  *
- *     TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen,
+ *     LTTNG_UST_TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen,
  *             long *, arg4, size_t, arg4_len),
  *
  *     * TP_FIELDS describes the event payload layout in the trace *