From: Michael Jeanson Date: Tue, 20 Apr 2021 20:23:32 +0000 (-0400) Subject: Tracepoint API namespacing 'TRACEPOINT_PROVIDER' X-Git-Tag: v2.13.0-rc1~53 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5b393d6424d959e2efbb800b0c8a61b81bf9968e;p=lttng-ust.git Tracepoint API namespacing 'TRACEPOINT_PROVIDER' 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: Ie72e03c0232f2b51e38783da2aed1305feab3c57 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 297ee274..089c1018 100644 --- a/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h +++ b/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h @@ -4,8 +4,8 @@ * Copyright (C) 2016 Sebastien Boisvert */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER gydle_om +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER gydle_om #undef LTTNG_UST_TRACEPOINT_INCLUDE #define LTTNG_UST_TRACEPOINT_INCLUDE "tracepoint-provider.h" @@ -16,7 +16,7 @@ #include LTTNG_UST_TRACEPOINT_EVENT( - TRACEPOINT_PROVIDER, + LTTNG_UST_TRACEPOINT_PROVIDER, align_query, LTTNG_UST_TP_ARGS( const char *, query_name @@ -27,7 +27,7 @@ LTTNG_UST_TRACEPOINT_EVENT( ) LTTNG_UST_TRACEPOINT_EVENT( - TRACEPOINT_PROVIDER, + LTTNG_UST_TRACEPOINT_PROVIDER, test_alignment, LTTNG_UST_TP_ARGS( const char *, alignment diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h index f661cb04..aa4a0863 100644 --- a/doc/examples/demo/ust_tests_demo.h +++ b/doc/examples/demo/ust_tests_demo.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_demo +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_demo #if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_DEMO_H diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h index 65abd679..5339e513 100644 --- a/doc/examples/demo/ust_tests_demo2.h +++ b/doc/examples/demo/ust_tests_demo2.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_demo2 +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_demo2 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_DEMO2_H diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h index e6014f76..bc0293a8 100644 --- a/doc/examples/demo/ust_tests_demo3.h +++ b/doc/examples/demo/ust_tests_demo3.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_demo3 +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_demo3 #if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_DEMO3_H diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h index f161d775..d6eb19dd 100644 --- a/doc/examples/easy-ust/sample_component_provider.h +++ b/doc/examples/easy-ust/sample_component_provider.h @@ -25,8 +25,8 @@ * In this example, "sample" is the project, and "component" is the * component. */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER sample_component +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER sample_component /* * include file (this files's name) @@ -56,7 +56,7 @@ LTTNG_UST_TRACEPOINT_EVENT( /* * provider name, not a variable but a string starting with a letter * and containing either letters, numbers or underscores. - * Needs to be the same as TRACEPOINT_PROVIDER + * Needs to be the same as LTTNG_UST_TRACEPOINT_PROVIDER */ sample_component, /* @@ -99,7 +99,7 @@ LTTNG_UST_TRACEPOINT_EVENT( LTTNG_UST_TRACEPOINT_LOGLEVEL( /* * The provider name, must be the same as the provider name in the - * LTTNG_UST_TRACEPOINT_EVENT and as TRACEPOINT_PROVIDER above. + * LTTNG_UST_TRACEPOINT_EVENT and as LTTNG_UST_TRACEPOINT_PROVIDER above. */ sample_component, /* diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h index fccbae2a..823b1820 100644 --- a/doc/examples/hello-static-lib/ust_tests_hello.h +++ b/doc/examples/hello-static-lib/ust_tests_hello.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_hello +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_HELLO_H diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index 545dcdc2..a2f54066 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -45,6 +45,12 @@ # endif #endif /* #if LTTNG_UST_COMPAT_API(0) */ +#if LTTNG_UST_COMPAT_API(0) +# if defined(TRACEPOINT_PROVIDER) && !defined(LTTNG_UST_TRACEPOINT_PROVIDER) +# define LTTNG_UST_TRACEPOINT_PROVIDER TRACEPOINT_PROVIDER +# endif +#endif /* #if LTTNG_UST_COMPAT_API(0) */ + #include LTTNG_UST_TRACEPOINT_INCLUDE #include diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 5d30703e..b637b853 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -815,7 +815,7 @@ lttng_ust__tracepoints__ptrs_destroy(void) * LTTNG_UST_TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >, * < loglevel_name >) * - * The TRACEPOINT_PROVIDER must be already declared before declaring a + * The LTTNG_UST_TRACEPOINT_PROVIDER must be already declared before declaring a * LTTNG_UST_TRACEPOINT_LOGLEVEL. */ diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index d3127016..6aa905ba 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -66,17 +66,17 @@ * Stage 0 of tracepoint event generation. * * Check that each LTTNG_UST_TRACEPOINT_EVENT provider argument match the - * TRACEPOINT_PROVIDER by creating dummy callbacks. + * LTTNG_UST_TRACEPOINT_PROVIDER by creating dummy callbacks. */ /* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */ #include static inline -void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) +void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, LTTNG_UST_TRACEPOINT_PROVIDER)(void) lttng_ust_notrace; static inline -void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) +void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, LTTNG_UST_TRACEPOINT_PROVIDER)(void) { } @@ -89,10 +89,10 @@ void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, TRACE lttng_ust_tracepoint_provider_mismatch_##_provider(); static inline -void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) +void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_TRACEPOINT_PROVIDER)(void) lttng_ust_notrace; static inline -void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) +void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_TRACEPOINT_PROVIDER)(void) { #include LTTNG_UST_TRACEPOINT_INCLUDE } @@ -1022,7 +1022,7 @@ LTTNG_UST_TP_EXTERN_C const char * const _model_emf_uri___##__provider##___##__n * symbol table. */ -extern const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER) +extern const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER) __attribute__((visibility("hidden"))); /* @@ -1077,7 +1077,7 @@ static const struct lttng_ust_event_desc __event_desc___##_provider##_##_name = #define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \ &__event_desc___##_provider##_##_name, -static const struct lttng_ust_event_desc * const LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)[] = { +static const struct lttng_ust_event_desc * const LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, LTTNG_UST_TRACEPOINT_PROVIDER)[] = { #include LTTNG_UST_TRACEPOINT_INCLUDE NULL, /* Dummy, C99 forbids 0-len array. */ }; @@ -1089,17 +1089,17 @@ static const struct lttng_ust_event_desc * const LTTNG_UST__TP_COMBINE_TOKENS(__ * Create a toplevel descriptor for the whole probe. */ -const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER) = { +const struct lttng_ust_probe_desc LTTNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER) = { .struct_size = sizeof(struct lttng_ust_probe_desc), - .provider_name = __tp_stringify(TRACEPOINT_PROVIDER), - .event_desc = LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER), - .nr_events = _TP_ARRAY_SIZE(LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, TRACEPOINT_PROVIDER)) - 1, + .provider_name = __tp_stringify(LTTNG_UST_TRACEPOINT_PROVIDER), + .event_desc = LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, LTTNG_UST_TRACEPOINT_PROVIDER), + .nr_events = _TP_ARRAY_SIZE(LTTNG_UST__TP_COMBINE_TOKENS(__event_desc___, LTTNG_UST_TRACEPOINT_PROVIDER)) - 1, .major = LTTNG_UST_PROVIDER_MAJOR, .minor = LTTNG_UST_PROVIDER_MINOR, }; -static int LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___, TRACEPOINT_PROVIDER); -static struct lttng_ust_registered_probe *LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER); +static int LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___, LTTNG_UST_TRACEPOINT_PROVIDER); +static struct lttng_ust_registered_probe *LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER); /* * Stage 9 of tracepoint event generation. @@ -1115,48 +1115,48 @@ static struct lttng_ust_registered_probe *LTTNG_UST__TP_COMBINE_TOKENS(__lttng_u /* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */ #include static void -LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, TRACEPOINT_PROVIDER)(void) +LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, LTTNG_UST_TRACEPOINT_PROVIDER)(void) lttng_ust_notrace __attribute__((constructor)); static void -LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, TRACEPOINT_PROVIDER)(void) +LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_init__, LTTNG_UST_TRACEPOINT_PROVIDER)(void) { struct lttng_ust_registered_probe *reg_probe; if (LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___, - TRACEPOINT_PROVIDER)++) { + LTTNG_UST_TRACEPOINT_PROVIDER)++) { return; } /* - * lttng_ust_tracepoint_provider_check_ ## TRACEPOINT_PROVIDER() is a + * lttng_ust_tracepoint_provider_check_ ## LTTNG_UST_TRACEPOINT_PROVIDER() is a * static inline function that ensures every probe PROVIDER * argument match the provider within which they appear. It * calls empty static inline functions, and therefore has no * runtime effect. However, if it detects an error, a linker * error will appear. */ - LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(); - assert(!LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER)); - reg_probe = lttng_ust_probe_register(<TNG_UST__TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER)); + LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, LTTNG_UST_TRACEPOINT_PROVIDER)(); + assert(!LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER)); + reg_probe = lttng_ust_probe_register(<TNG_UST__TP_COMBINE_TOKENS(__probe_desc___, LTTNG_UST_TRACEPOINT_PROVIDER)); if (!reg_probe) { fprintf(stderr, "LTTng-UST: Error while registering tracepoint probe.\n"); abort(); } - LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER) = reg_probe; + LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER) = reg_probe; } static void -LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, TRACEPOINT_PROVIDER)(void) +LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, LTTNG_UST_TRACEPOINT_PROVIDER)(void) lttng_ust_notrace __attribute__((destructor)); static void -LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, TRACEPOINT_PROVIDER)(void) +LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_events_exit__, LTTNG_UST_TRACEPOINT_PROVIDER)(void) { if (--LTTNG_UST__TP_COMBINE_TOKENS(__probe_register_refcount___, - TRACEPOINT_PROVIDER)) { + LTTNG_UST_TRACEPOINT_PROVIDER)) { return; } - lttng_ust_probe_unregister(LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER)); - LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER) = NULL; + lttng_ust_probe_unregister(LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER)); + LTTNG_UST__TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, LTTNG_UST_TRACEPOINT_PROVIDER) = NULL; } -int LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_, TRACEPOINT_PROVIDER) +int LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_, LTTNG_UST_TRACEPOINT_PROVIDER) __attribute__((visibility("default"))); 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 8c399855..e5bbba69 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 @@ -4,8 +4,8 @@ * Copyright (C) 2011-2013 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile_fast +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_cyg_profile_fast #if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_FAST_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 87da97df..c4e22e3c 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 @@ -4,8 +4,8 @@ * Copyright (C) 2011-2013 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_cyg_profile +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_cyg_profile #if !defined(_TRACEPOINT_LTTNG_UST_CYG_PROFILE_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_CYG_PROFILE_H diff --git a/src/lib/lttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h index 830dc58c..02866932 100644 --- a/src/lib/lttng-ust-dl/ust_dl.h +++ b/src/lib/lttng-ust-dl/ust_dl.h @@ -5,8 +5,8 @@ * Copyright (C) 2015 Antoine Busque */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_dl +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_dl #if !defined(_TRACEPOINT_UST_DL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_DL_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 459333c6..5a28f63e 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 @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_jul +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_jul #if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_JUL_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 bf92c5e4..53406a04 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 @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_log4j +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_log4j #if !defined(_TRACEPOINT_LTTNG_UST_LOG4J_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_LOG4J_H diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h index 08381e05..545d891e 100644 --- a/src/lib/lttng-ust-java/lttng_ust_java.h +++ b/src/lib/lttng-ust-java/lttng_ust_java.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_java +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_java #if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_JAVA_H diff --git a/src/lib/lttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h index 437b33d4..bd7bb3a2 100644 --- a/src/lib/lttng-ust-libc-wrapper/ust_libc.h +++ b/src/lib/lttng-ust-libc-wrapper/ust_libc.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_libc +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_libc #if !defined(_TRACEPOINT_UST_LIBC_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_LIBC_H diff --git a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h index 18915494..c17ba4ab 100644 --- a/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h +++ b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h @@ -4,8 +4,8 @@ * Copyright (C) 2013 Mentor Graphics */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_pthread +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_pthread #if !defined(_TRACEPOINT_UST_PTHREAD_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_PTHREAD_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 53466c3a..677ad94a 100644 --- a/src/lib/lttng-ust-python-agent/lttng_ust_python.h +++ b/src/lib/lttng-ust-python-agent/lttng_ust_python.h @@ -4,8 +4,8 @@ * Copyright (C) 2014 - David Goulet */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_python +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_python #if !defined(_TRACEPOINT_LTTNG_UST_PYTHON_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_PYTHON_H diff --git a/src/lib/lttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h index 3b2f8510..df5c178b 100644 --- a/src/lib/lttng-ust/lttng-ust-statedump-provider.h +++ b/src/lib/lttng-ust/lttng-ust-statedump-provider.h @@ -5,8 +5,8 @@ * Copyright (C) 2015 Antoine Busque */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_statedump +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_statedump #if !defined(_TRACEPOINT_LTTNG_UST_STATEDUMP_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_STATEDUMP_H diff --git a/src/lib/lttng-ust/lttng-ust-tracef-provider.h b/src/lib/lttng-ust/lttng-ust-tracef-provider.h index 588cfc14..3dc50961 100644 --- a/src/lib/lttng-ust/lttng-ust-tracef-provider.h +++ b/src/lib/lttng-ust/lttng-ust-tracef-provider.h @@ -4,8 +4,8 @@ * Copyright (C) 2011-2014 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_tracef +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_tracef #if !defined(_TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H diff --git a/src/lib/lttng-ust/lttng-ust-tracelog-provider.h b/src/lib/lttng-ust/lttng-ust-tracelog-provider.h index 17f4c17c..7c70ee79 100644 --- a/src/lib/lttng-ust/lttng-ust-tracelog-provider.h +++ b/src/lib/lttng-ust/lttng-ust-tracelog-provider.h @@ -4,8 +4,8 @@ * Copyright (C) 2011-2015 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_tracelog +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_tracelog #if !defined(_TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H diff --git a/src/lib/lttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h index d3814b61..3bf94c25 100644 --- a/src/lib/lttng-ust/ust_lib.h +++ b/src/lib/lttng-ust/ust_lib.h @@ -6,8 +6,8 @@ * Copyright (C) 2016 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_ust_lib +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_ust_lib #if !defined(_TRACEPOINT_UST_LIB_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_LIB_H diff --git a/tests/benchmark/ust_tests_benchmark.h b/tests/benchmark/ust_tests_benchmark.h index cda11169..820731b7 100644 --- a/tests/benchmark/ust_tests_benchmark.h +++ b/tests/benchmark/ust_tests_benchmark.h @@ -4,8 +4,8 @@ * Copyright (C) 2013 Zifei Tong */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_benchmark +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_benchmark #if !defined(_TRACEPOINT_UST_TESTS_BENCHMARK_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_BENCHMARK_H diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h index b1d69172..630d0d4e 100644 --- a/tests/compile/ctf-types/ust_tests_ctf_types.h +++ b/tests/compile/ctf-types/ust_tests_ctf_types.h @@ -4,8 +4,8 @@ * Copyright (C) 2014 Geneviève Bastien */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_ctf_types +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_ctf_types #if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_CTF_TYPES_H diff --git a/tests/compile/hello-many/ust_tests_hello_many.h b/tests/compile/hello-many/ust_tests_hello_many.h index 86509d52..98cb603b 100644 --- a/tests/compile/hello-many/ust_tests_hello_many.h +++ b/tests/compile/hello-many/ust_tests_hello_many.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_hello_many +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello_many #if !defined(_TRACEPOINT_UST_TESTS_HELLO_MANY_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_HELLO_MANY_H diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h index d674becc..dfe20f5d 100644 --- a/tests/compile/hello.cxx/ust_tests_hello.h +++ b/tests/compile/hello.cxx/ust_tests_hello.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_hello +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_HELLO_H diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h index e25ebb07..7cd0f822 100644 --- a/tests/compile/hello/ust_tests_hello.h +++ b/tests/compile/hello/ust_tests_hello.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_hello +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_HELLO_H diff --git a/tests/compile/same_line_tracepoint/ust_tests_sameline.h b/tests/compile/same_line_tracepoint/ust_tests_sameline.h index 838e72b6..b2e4d8aa 100644 --- a/tests/compile/same_line_tracepoint/ust_tests_sameline.h +++ b/tests/compile/same_line_tracepoint/ust_tests_sameline.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_sameline +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_sameline #if !defined(_TRACEPOINT_UST_TESTS_SAMELINE_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_SAMELINE_H diff --git a/tests/compile/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h index ca289374..3e0e4d01 100644 --- a/tests/compile/test-app-ctx/ust_tests_hello.h +++ b/tests/compile/test-app-ctx/ust_tests_hello.h @@ -4,8 +4,8 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER ust_tests_hello +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_UST_TESTS_HELLO_H diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp index 4e74de0d..e49083ba 100755 --- a/tools/lttng-gen-tp +++ b/tools/lttng-gen-tp @@ -19,8 +19,8 @@ class Usage(Exception): class HeaderFile: HEADER_TPL = """ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER {providerName} +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER {providerName} #undef LTTNG_UST_TRACEPOINT_INCLUDE #define LTTNG_UST_TRACEPOINT_INCLUDE "./{headerFilename}"