Tracepoint API namespacing 'TRACEPOINT_INCLUDE'

The ABI bump gives us the opportunity to namespace all public symbols
under the 'lttng_ust_' prefix. Namespace all API symbols and macros
under 'lttng_ust_' / 'LTTNG_UST_' and add compat macros to keep
compatibility with the previous API.

Change-Id: I1fe79f1914c0f2da86c419c578f0f4d2f36df3b7
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
index 170738fabf15723d3e04359b626d7a6965a49d6f..297ee274601a91d9f60c2d3dec0040e35d510d35 100644 (file)
--- a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
+++ b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h
@@ -7,8 +7,8 @@
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER gydle_om
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "tracepoint-provider.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "tracepoint-provider.h"
 
 #if !defined(MY_TRACEPOINT_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define MY_TRACEPOINT_PROVIDER_H

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index 89d4dc1da84fbe57ae0ddbcf6142441f08997130..f661cb0427087716c23102d513c6bbad4dc71b83 100644 (file)
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -40,8 +40,8 @@ LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, done,
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_demo.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_demo.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h
index 94de3b5354e8897d68a9b0574d8f08c76c51a625..65abd67940a17414e34543f7ce8f2371510cc0b1 100644 (file)
--- a/doc/examples/demo/ust_tests_demo2.h
+++ b/doc/examples/demo/ust_tests_demo2.h
@@ -38,8 +38,8 @@ LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, LTTNG_UST_TRACEPOINT_LOGLEV
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO2_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h
index d2f2b01b122afedf89461b7b9f5fbc04e060cef4..e6014f76332004034eb503577b244548f9f6e1c5 100644 (file)
--- a/doc/examples/demo/ust_tests_demo3.h
+++ b/doc/examples/demo/ust_tests_demo3.h
@@ -22,8 +22,8 @@ LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_demo3, done, LTTNG_UST_TRACEPOINT_LOGLEV
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO3_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_demo3.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_demo3.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h
index d82fa0ebf2f8c81749169363542b074d792cacb1..f161d775a939d5a39dd4b3fdcda69c0f60f2fc55 100644 (file)
--- a/doc/examples/easy-ust/sample_component_provider.h
+++ b/doc/examples/easy-ust/sample_component_provider.h
@@ -31,8 +31,8 @@
 /*
  * include file (this files's name)
  */
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./sample_component_provider.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./sample_component_provider.h"
 
 /*
  * Add this precompiler conditionals to ensure the tracepoint event generation

diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h
index e48434fb4dd1563de316de77c45c88c5ed338eef..fccbae2ad093a6d346d42bdca5d231630758fb68 100644 (file)
--- a/doc/examples/hello-static-lib/ust_tests_hello.h
+++ b/doc/examples/hello-static-lib/ust_tests_hello.h
@@ -42,8 +42,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 639a05db0c21cc98bcbd797cff0970e8d8fdc435..545dcdc254351bd88fcafa7c95939f06f440873b 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -39,7 +39,13 @@
 #define TRACEPOINT_HEADER_MULTI_READ
 #endif
 
-#include TRACEPOINT_INCLUDE
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TRACEPOINT_INCLUDE) && !defined(LTTNG_UST_TRACEPOINT_INCLUDE)
+#  define LTTNG_UST_TRACEPOINT_INCLUDE TRACEPOINT_INCLUDE
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #include <lttng/ust-tracepoint-event.h>
 
@@ -48,7 +54,10 @@
 #undef TRACEPOINT_HEADER_MULTI_READ
 #endif
 
-#undef TRACEPOINT_INCLUDE
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#if LTTNG_UST_COMPAT_API(0)
+# undef TRACEPOINT_INCLUDE
+#endif
 
 #define LTTNG_UST_TRACEPOINT_CREATE_PROBES
 

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index acd315c7dcbedd08ef5b99cf4619e1ced452741c..d3127016378c143061eb6118075464bb790b8f4c 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -94,7 +94,7 @@ void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOI
 static inline
 void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void)
 {
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 }
 
 /*
@@ -111,7 +111,7 @@ void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOI
 #define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)       \
        lttng_ust_tracepoint_validate_name_len(_provider, _name);
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 0.2 of tracepoint event generation.
@@ -135,7 +135,7 @@ void __event_template_proto___##_provider##___##_template(LTTNG_UST__TP_ARGS_DAT
 #define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
 void __event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PROTO(_args));
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 0.9 of tracepoint event generation
@@ -207,7 +207,7 @@ void __event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PR
                _values                                                 \
                ctf_enum_value("", 0)   /* Dummy, 0-len array forbidden by C99. */ \
        };
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 0.9.1
@@ -238,7 +238,7 @@ void __event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PR
 #define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)    \
                _fields
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 1 of tracepoint event generation.
@@ -376,7 +376,7 @@ void __event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PR
                .nr_entries = _TP_ARRAY_SIZE(__enum_values__##_provider##_##_name) - 1, \
        };
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 2 of tracepoint event generation.
@@ -394,7 +394,7 @@ void __event_template_proto___##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PR
 #define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)            \
 static void __event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PROTO(_args));
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 3.0 of tracepoint event generation.
@@ -480,7 +480,7 @@ size_t __event_get_size__##_provider##___##_name(                         \
        return __event_len;                                                   \
 }
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 3.1 of tracepoint event generation.
@@ -643,7 +643,7 @@ void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da
        _fields                                                               \
 }
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 4 of tracepoint event generation.
@@ -717,7 +717,7 @@ size_t __event_get_align__##_provider##___##_name(LTTNG_UST__TP_ARGS_PROTO(_args
        return __event_align;                                                 \
 }
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 
 /*
@@ -920,7 +920,7 @@ void __event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PROTO(_args)
        }                                                                     \
 }
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #undef __get_dynamic_len
 
@@ -943,7 +943,7 @@ void __event_probe__##_provider##___##_name(LTTNG_UST__TP_ARGS_DATA_PROTO(_args)
 static const char __tp_event_signature___##_provider##___##_name[] =   \
                _TP_EXTRACT_STRING2(_args);
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #undef _TP_EXTRACT_STRING2
 
@@ -978,7 +978,7 @@ LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name       \
                __attribute__((visibility("hidden"))) =                         \
                &_loglevel_value___##__provider##___##__name;
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #undef LTTNG_UST_TP_EXTERN_C
 
@@ -1008,7 +1008,7 @@ LTTNG_UST_TP_EXTERN_C const int * const _loglevel___##__provider##___##__name     \
 LTTNG_UST_TP_EXTERN_C const char * const _model_emf_uri___##__provider##___##__name   \
                __attribute__((visibility("hidden"))) = __uri;             \
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #undef LTTNG_UST_TP_EXTERN_C
 
@@ -1062,7 +1062,7 @@ static const struct lttng_ust_event_desc __event_desc___##_provider##_##_name =
        .model_emf_uri = &__ref_model_emf_uri___##_provider##___##_name,       \
 };
 
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 /*
  * Stage 7.2 of tracepoint event generation.
@@ -1078,7 +1078,7 @@ static const struct lttng_ust_event_desc __event_desc___##_provider##_##_name =
        &__event_desc___##_provider##_##_name,
 
 static const struct lttng_ust_event_desc * const LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)[] = {
-#include TRACEPOINT_INCLUDE
+#include LTTNG_UST_TRACEPOINT_INCLUDE
        NULL,   /* Dummy, C99 forbids 0-len array. */
 };
 

diff --git a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
index 66c63c37fd692b7747ba5e4d2fe413fcfe183f5d..8c399855b0b3fc83fd86de03d2fdf3fde60e1563 100644 (file)
--- a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
+++ b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h
@@ -39,8 +39,8 @@ LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile_fast, func_exit,
 
 #endif /* _TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-cyg-profile-fast.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng-ust-cyg-profile-fast.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
index c286f155fc4c6ec123bafa0c21a7a01c3a8a9689..87da97dfc35810194c081f7937cf394615f6cd05 100644 (file)
--- a/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
+++ b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h
@@ -44,8 +44,8 @@ LTTNG_UST_TRACEPOINT_LOGLEVEL(lttng_ust_cyg_profile, func_exit,
 
 #endif /* _TRACEPOINT_LTTNG_UST_CYG_PROFILE_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-cyg-profile.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng-ust-cyg-profile.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h
index f2e6886fd811519872997d8e1b5b90bff8ee5b71..830dc58c9668ebf9dd0d185140db5d91ca2a0fc8 100644 (file)
--- a/src/lib/lttng-ust-dl/ust_dl.h
+++ b/src/lib/lttng-ust-dl/ust_dl.h
@@ -96,8 +96,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlclose,
 
 #endif /* _TRACEPOINT_UST_DL_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_dl.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_dl.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
index dc941ef38140e0fee885756664a30a6781fd6196..459333c6ae309bc40258248e4b800f090d6fc924 100644 (file)
--- a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
+++ b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
@@ -37,8 +37,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_jul, event,
 
 #endif /* _TRACEPOINT_LTTNG_UST_JUL_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_jul.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_jul.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
index 2b8420ad10e11d237ae76b359dae55d1505868e6..bf92c5e47427e83831c8e55afee22ea265469bb7 100644 (file)
--- a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
+++ b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
@@ -41,8 +41,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_log4j, event,
 
 #endif /* _TRACEPOINT_LTTNG_UST_LOG4J_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_log4j.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_log4j.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h
index 54a2087846c4f440efbdbd737d7c4acbb531d311..08381e059dc671703bc29e847e998b286881e3a6 100644 (file)
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -56,8 +56,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, string_event,
 
 #endif /* _TRACEPOINT_LTTNG_UST_JAVA_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_java.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_java.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
index b9d74db0ab9a69ba4d0ef717e2d2b5ba451933dd..437b33d4e1f1d27f861fc60114c2930700bd20e5 100644 (file)
--- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h
+++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h
@@ -76,8 +76,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_libc, posix_memalign,
 
 #endif /* _TRACEPOINT_UST_LIBC_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_libc.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_libc.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
index d0fb1acdce12cb25d7983f8009265529518387f1..18915494d6abfa65f5723603e6d035745f7e9576 100644 (file)
--- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
+++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h
@@ -53,8 +53,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_pthread, pthread_mutex_unlock,
 
 #endif /* _TRACEPOINT_UST_PTHREAD_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_pthread.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_pthread.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust-python-agent/lttng_ust_python.h b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
index 40b91fc3046930c628c10e69f0fff8f7c6f4ca95..53466c3acfdc5cedfa3948e1b4126116c1435f36 100644 (file)
--- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h
+++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h
@@ -38,8 +38,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_python, event,
 
 #endif /* _TRACEPOINT_LTTNG_UST_PYTHON_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_python.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_python.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
index 3fbcf8d2aef5d7847b19217ae386ee3bff971ae5..3b2f85100d9b13cec53a1042e3a65e09e201cf2f 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h
@@ -101,8 +101,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_statedump, end,
 
 #endif /* _TRACEPOINT_LTTNG_UST_STATEDUMP_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-statedump-provider.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng-ust-statedump-provider.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust/lttng-ust-tracef-provider.h b/src/lib/lttng-ust/lttng-ust-tracef-provider.h
index ddb9a09ac656242f65e9c4f948f518b463c18ee9..588cfc14e28fed9ffbfce26379e657860e9ebbda 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-tracef-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-tracef-provider.h
@@ -15,8 +15,8 @@
 #endif /* _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H */
 
 #define TP_IP_PARAM ip /* IP context received as parameter */
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./tp/lttng-ust-tracef.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./tp/lttng-ust-tracef.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust/lttng-ust-tracelog-provider.h b/src/lib/lttng-ust/lttng-ust-tracelog-provider.h
index 000ca639884912ffd94f90bfd344d25e46548e7c..17f4c17cd6798c900c6a189e5e4523c139cf124d 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-tracelog-provider.h
+++ b/src/lib/lttng-ust/lttng-ust-tracelog-provider.h
@@ -15,8 +15,8 @@
 #endif /* _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H */
 
 #define TP_IP_PARAM ip /* IP context received as parameter */
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./tp/lttng-ust-tracelog.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./tp/lttng-ust-tracelog.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h
index d645804b6e3995a0f33de05823bb3e41893967db..d3814b616d91d3cb8d04db67f418443ec058edd5 100644 (file)
--- a/src/lib/lttng-ust/ust_lib.h
+++ b/src/lib/lttng-ust/ust_lib.h
@@ -77,8 +77,8 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_lib, unload,
 
 #endif /* _TRACEPOINT_UST_LIB_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_lib.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_lib.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/benchmark/ust_tests_benchmark.h b/tests/benchmark/ust_tests_benchmark.h
index c8862bfcb98cb269bd87b299f902314b083c1956..cda111694895fb7e1a67bd01f0695010a0b3eaaa 100644 (file)
--- a/tests/benchmark/ust_tests_benchmark.h
+++ b/tests/benchmark/ust_tests_benchmark.h
@@ -21,8 +21,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_benchmark, tpbench,
 
 #endif /* _TRACEPOINT_UST_TESTS_BENCHMARK_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_benchmark.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_benchmark.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h
index def0293a71d13ae0b4a8ec79a6609136d2c139da..b1d6917250795286f127bef2b75c8a6bd262ab57 100644 (file)
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -60,8 +60,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
 
 #endif /* _TRACEPOINT_UST_TESTS_CTF_TYPES_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_ctf_types.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_ctf_types.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/compile/hello-many/ust_tests_hello_many.h b/tests/compile/hello-many/ust_tests_hello_many.h
index 9f10c4f6faa38c92bbe737921bce84af105abe6f..86509d524ef757de767f4c0cdd6db48f485d53c9 100644 (file)
--- a/tests/compile/hello-many/ust_tests_hello_many.h
+++ b/tests/compile/hello-many/ust_tests_hello_many.h
@@ -216,8 +216,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello_many, tptest_simple40,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_MANY_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello_many.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello_many.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index 308d024ff738268206a3a830d51d7b8a8b60d9f3..d674becc53e4edc7d3325527ab5ba4611370cab5 100644 (file)
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -55,8 +55,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index 5c2415cdbc6172589def50000ba7256f4b3f5cdd..e25ebb07cfa5b10bf8adfaeff553c2eb8d0e6af8 100644 (file)
--- a/tests/compile/hello/ust_tests_hello.h
+++ b/tests/compile/hello/ust_tests_hello.h
@@ -57,8 +57,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/compile/same_line_tracepoint/ust_tests_sameline.h b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
index 49535f7e5593b5f182dac0a1b56c25730d62a133..838e72b6b0205b27751f7847998b87195fa83bfc 100644 (file)
--- a/tests/compile/same_line_tracepoint/ust_tests_sameline.h
+++ b/tests/compile/same_line_tracepoint/ust_tests_sameline.h
@@ -26,8 +26,8 @@ LTTNG_UST_TRACEPOINT_LOGLEVEL(ust_tests_sameline, event2, TRACE_CRIT)
 
 #endif /* _TRACEPOINT_UST_TESTS_SAMELINE_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_sameline.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_sameline.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h
index 906adeddb052c4b867546732c4ab89ef3447e563..ca289374ea8f80293b33f3b0d6c2379ab1ff6975 100644 (file)
--- a/tests/compile/test-app-ctx/ust_tests_hello.h
+++ b/tests/compile/test-app-ctx/ust_tests_hello.h
@@ -46,8 +46,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index 8a8d66d95cce2284b76104fc102eb24cce1ea62e..4e74de0d039107e66f5fcc6f5cd5a7a6c0351560 100755 (executable)
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -22,8 +22,8 @@ class HeaderFile:
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER {providerName}
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./{headerFilename}"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./{headerFilename}"
 
 #if !defined({includeGuard}) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define {includeGuard}