From: Michael Jeanson Date: Tue, 20 Apr 2021 18:28:44 +0000 (-0400) Subject: Tracepoint API namespacing 'TRACEPOINT_INCLUDE' X-Git-Tag: v2.13.0-rc1~54 X-Git-Url: https://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=bb71a8ea3b2e7335393a6810887fb9b145cc6f7e 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 Signed-off-by: Mathieu Desnoyers --- diff --git a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h index 170738fa..297ee274 100644 --- 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 89d4dc1d..f661cb04 100644 --- 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 diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h index 94de3b53..65abd679 100644 --- 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 diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h index d2f2b01b..e6014f76 100644 --- 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 diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h index d82fa0eb..f161d775 100644 --- 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 e48434fb..fccbae2a 100644 --- 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 diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index 639a05db..545dcdc2 100644 --- 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 @@ -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 acd315c7..d3127016 100644 --- 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 66c63c37..8c399855 100644 --- 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 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 c286f155..87da97df 100644 --- 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 diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h index f2e6886f..830dc58c 100644 --- 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 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 dc941ef3..459333c6 100644 --- 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 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 2b8420ad..bf92c5e4 100644 --- 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 diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h index 54a20878..08381e05 100644 --- 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 diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h index b9d74db0..437b33d4 100644 --- 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 diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h index d0fb1acd..18915494 100644 --- 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 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 40b91fc3..53466c3a 100644 --- 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 diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h index 3fbcf8d2..3b2f8510 100644 --- 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 diff --git a/src/lib/lttng-ust/lttng-ust-tracef-provider.h b/src/lib/lttng-ust/lttng-ust-tracef-provider.h index ddb9a09a..588cfc14 100644 --- 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 diff --git a/src/lib/lttng-ust/lttng-ust-tracelog-provider.h b/src/lib/lttng-ust/lttng-ust-tracelog-provider.h index 000ca639..17f4c17c 100644 --- 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 diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h index d645804b..d3814b61 100644 --- 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 diff --git a/tests/benchmark/ust_tests_benchmark.h b/tests/benchmark/ust_tests_benchmark.h index c8862bfc..cda11169 100644 --- 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 diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h index def0293a..b1d69172 100644 --- 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 diff --git a/tests/compile/hello-many/ust_tests_hello_many.h b/tests/compile/hello-many/ust_tests_hello_many.h index 9f10c4f6..86509d52 100644 --- 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 diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h index 308d024f..d674becc 100644 --- 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 diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h index 5c2415cd..e25ebb07 100644 --- 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 diff --git a/tests/compile/same_line_tracepoint/ust_tests_sameline.h b/tests/compile/same_line_tracepoint/ust_tests_sameline.h index 49535f7e..838e72b6 100644 --- 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 diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h index 906adedd..ca289374 100644 --- 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 diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp index 8a8d66d9..4e74de0d 100755 --- 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}