From 0274f7f24e55825f2a51804d50100676d468c06d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 20 Apr 2021 10:39:07 -0400 Subject: [PATCH] Tracepoint API namespacing '__tracepoint_' 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: I2ecc085f05956cedb58f8e3109a746304aef2ec6 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/lttng/tracef.h | 4 +- include/lttng/tracelog.h | 4 +- include/lttng/tracepoint.h | 70 +++++++++---------- include/lttng/ust-tracepoint-event.h | 18 ++--- src/lib/lttng-ust-dl/lttng-ust-dl.c | 6 +- .../tracepoint-weak-test.c | 12 ++-- src/lib/lttng-ust-tracepoint/tracepoint.c | 22 +++--- src/lib/lttng-ust/tracef.c | 2 +- src/lib/lttng-ust/tracelog.c | 2 +- 9 files changed, 70 insertions(+), 70 deletions(-) diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h index 6890027d..4526d3d8 100644 --- a/include/lttng/tracef.h +++ b/include/lttng/tracef.h @@ -24,13 +24,13 @@ void _lttng_ust_vtracef(const char *fmt, va_list ap) #define tracef(fmt, ...) \ do { \ LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \ - if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \ + if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracef___event.state)) \ _lttng_ust_tracef(fmt, ## __VA_ARGS__); \ } while (0) #define vtracef(fmt, ap) \ do { \ - if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \ + if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracef___event.state)) \ _lttng_ust_vtracef(fmt, ap); \ } while (0) #ifdef __cplusplus diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h index d5fd9369..d997f74c 100644 --- a/include/lttng/tracelog.h +++ b/include/lttng/tracelog.h @@ -44,14 +44,14 @@ TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG); #define tracelog(level, fmt, ...) \ do { \ LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \ - if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \ + if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \ _lttng_ust_tracelog_##level(__FILE__, __LINE__, __func__, \ fmt, ## __VA_ARGS__); \ } while (0) #define vtracelog(level, fmt, ap) \ do { \ - if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \ + if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \ _lttng_ust_vtracelog_##level(__FILE__, __LINE__, __func__, \ fmt, ap); \ } while (0) diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 31cafe4d..48781e8e 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -51,10 +51,10 @@ extern "C" { #endif #define lttng_ust_tracepoint_enabled(provider, name) \ - caa_unlikely(CMM_LOAD_SHARED(__tracepoint_##provider##___##name.state)) + caa_unlikely(CMM_LOAD_SHARED(lttng_ust_tracepoint_##provider##___##name.state)) #define lttng_ust_do_tracepoint(provider, name, ...) \ - __tracepoint_cb_##provider##___##name(__VA_ARGS__) + lttng_ust_tracepoint_cb_##provider##___##name(__VA_ARGS__) #define lttng_ust_tracepoint(provider, name, ...) \ do { \ @@ -182,19 +182,19 @@ extern "C" { * address. */ #define LTTNG_UST__DECLARE_TRACEPOINT(_provider, _name, ...) \ -extern struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name; \ +extern struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name; \ static inline \ -void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ +void lttng_ust_tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ __attribute__((always_inline, unused)) lttng_ust_notrace; \ static \ -void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ +void lttng_ust_tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ { \ struct lttng_ust_tracepoint_probe *__tp_probe; \ \ if (caa_unlikely(!TP_RCU_LINK_TEST())) \ return; \ tp_rcu_read_lock(); \ - __tp_probe = tp_rcu_dereference(__tracepoint_##_provider##___##_name.probes); \ + __tp_probe = tp_rcu_dereference(lttng_ust_tracepoint_##_provider##___##_name.probes); \ if (caa_unlikely(!__tp_probe)) \ goto end; \ do { \ @@ -208,30 +208,30 @@ end: \ tp_rcu_read_unlock(); \ } \ static inline \ -void __tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \ +void lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \ void (*func)(void), void *data) \ lttng_ust_notrace; \ static inline \ -void __tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \ +void lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \ void (*func)(void), void *data) \ { \ - __tracepoint_probe_register(provider_name, event_name, func, data, \ - __tracepoint_##_provider##___##_name.signature); \ + lttng_ust_tracepoint_probe_register(provider_name, event_name, func, data, \ + lttng_ust_tracepoint_##_provider##___##_name.signature); \ } \ static inline \ -void __tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \ +void lttng_ust_tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \ void (*func)(void), void *data) \ lttng_ust_notrace; \ static inline \ -void __tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \ +void lttng_ust_tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \ void (*func)(void), void *data) \ { \ - __tracepoint_probe_unregister(provider_name, event_name, func, data); \ + lttng_ust_tracepoint_probe_unregister(provider_name, event_name, func, data); \ } -extern int __tracepoint_probe_register(const char *provider_name, const char *event_name, +extern int lttng_ust_tracepoint_probe_register(const char *provider_name, const char *event_name, void (*func)(void), void *data, const char *signature); -extern int __tracepoint_probe_unregister(const char *provider_name, const char *event_name, +extern int lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name, void (*func)(void), void *data); /* @@ -269,9 +269,9 @@ extern struct lttng_ust_tracepoint_dlopen *lttng_ust_tracepoint_dlopen_ptr; * registering only _one_ instance of the tracepoints per shared-ojbect * (or for the whole main program). */ -int __tracepoint_registered +int lttng_ust_tracepoint_registered __attribute__((weak, visibility("hidden"))); -int __tracepoint_ptrs_registered +int lttng_ust_tracepoint_ptrs_registered __attribute__((weak, visibility("hidden"))); struct lttng_ust_tracepoint_dlopen lttng_ust_tracepoint_dlopen __attribute__((weak, visibility("hidden"))) = { @@ -335,10 +335,10 @@ static inline void tracepoint_disable_destructors(void) #ifndef _LGPL_SOURCE static inline void -__tracepoint__init_urcu_sym(void) +lttng_ust_tracepoint__init_urcu_sym(void) lttng_ust_notrace; static inline void -__tracepoint__init_urcu_sym(void) +lttng_ust_tracepoint__init_urcu_sym(void) { if (!lttng_ust_tracepoint_dlopen_ptr) lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; @@ -364,10 +364,10 @@ __tracepoint__init_urcu_sym(void) } #else static inline void -__tracepoint__init_urcu_sym(void) +lttng_ust_tracepoint__init_urcu_sym(void) lttng_ust_notrace; static inline void -__tracepoint__init_urcu_sym(void) +lttng_ust_tracepoint__init_urcu_sym(void) { } #endif @@ -378,10 +378,10 @@ __tracepoints__init(void) static void __tracepoints__init(void) { - if (__tracepoint_registered++) { + if (lttng_ust_tracepoint_registered++) { if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) return; - __tracepoint__init_urcu_sym(); + lttng_ust_tracepoint__init_urcu_sym(); return; } @@ -392,7 +392,7 @@ __tracepoints__init(void) dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL); if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) return; - __tracepoint__init_urcu_sym(); + lttng_ust_tracepoint__init_urcu_sym(); } static void @@ -403,7 +403,7 @@ __tracepoints__destroy(void) { int ret; - if (--__tracepoint_registered) + if (--lttng_ust_tracepoint_registered) return; if (!lttng_ust_tracepoint_dlopen_ptr) lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; @@ -411,7 +411,7 @@ __tracepoints__destroy(void) lttng_ust_tracepoint_destructors_syms_ptr = <tng_ust_tracepoint_destructors_syms; if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) return; - if (__tracepoint_ptrs_registered) + if (lttng_ust_tracepoint_ptrs_registered) return; /* * Lookup if destructors must be executed using the new method. @@ -457,7 +457,7 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[] #ifdef TRACEPOINT_PROBE_DYNAMIC_LINKAGE #define _TRACEPOINT_UNDEFINED_REF(provider) NULL #else /* TRACEPOINT_PROBE_DYNAMIC_LINKAGE */ -#define _TRACEPOINT_UNDEFINED_REF(provider) &__tracepoint_provider_##provider +#define _TRACEPOINT_UNDEFINED_REF(provider) <tng_ust_tracepoint_provider_##provider #endif /* TRACEPOINT_PROBE_DYNAMIC_LINKAGE */ /* @@ -469,14 +469,14 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[] #define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args) \ lttng_ust_tracepoint_validate_name_len(_provider, _name); \ - extern int __tracepoint_provider_##_provider; \ + extern int lttng_ust_tracepoint_provider_##_provider; \ static const char __tp_provider_strtab_##_provider##___##_name[] \ __attribute__((section("__tracepoints_strings"))) = \ #_provider; \ static const char __tp_name_strtab_##_provider##___##_name[] \ __attribute__((section("__tracepoints_strings"))) = \ #_name; \ - struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name \ + struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name \ __attribute__((section("__tracepoints"))) = { \ sizeof(struct lttng_ust_tracepoint), \ __tp_provider_strtab_##_provider##___##_name, \ @@ -487,10 +487,10 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[] _TP_EXTRACT_STRING(_args), \ }; \ static struct lttng_ust_tracepoint * \ - __tracepoint_ptr_##_provider##___##_name \ + lttng_ust_tracepoint_ptr_##_provider##___##_name \ __attribute__((section("__tracepoints_ptrs"), used)) \ __lttng_ust_variable_attribute_no_sanitize_address = \ - &__tracepoint_##_provider##___##_name; + <tng_ust_tracepoint_##_provider##___##_name; static void __tracepoints__ptrs_init(void) @@ -498,7 +498,7 @@ __tracepoints__ptrs_init(void) static void __tracepoints__ptrs_init(void) { - if (__tracepoint_ptrs_registered++) + if (lttng_ust_tracepoint_ptrs_registered++) return; if (!lttng_ust_tracepoint_dlopen_ptr) lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; @@ -525,7 +525,7 @@ __tracepoints__ptrs_init(void) URCU_FORCE_CAST(int (*)(void), dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "tp_get_destructors_state")); - __tracepoint__init_urcu_sym(); + lttng_ust_tracepoint__init_urcu_sym(); if (lttng_ust_tracepoint_dlopen_ptr->tracepoint_register_lib) { lttng_ust_tracepoint_dlopen_ptr->tracepoint_register_lib(__start___tracepoints_ptrs, __stop___tracepoints_ptrs - @@ -541,7 +541,7 @@ __tracepoints__ptrs_destroy(void) { int ret; - if (--__tracepoint_ptrs_registered) + if (--lttng_ust_tracepoint_ptrs_registered) return; if (!lttng_ust_tracepoint_dlopen_ptr) lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; @@ -552,7 +552,7 @@ __tracepoints__ptrs_destroy(void) if (lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state() - && !__tracepoint_ptrs_registered) { + && !lttng_ust_tracepoint_ptrs_registered) { ret = dlclose(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle); if (ret) { fprintf(stderr, "Error (%d) in dlclose\n", ret); diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 4a6ebc5a..7a7c0799 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -73,26 +73,26 @@ #include static inline -void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) +void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace; static inline -void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) +void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) { } #undef LTTNG_UST__TRACEPOINT_EVENT_CLASS #define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ - __tracepoint_provider_mismatch_##_provider(); + lttng_ust_tracepoint_provider_mismatch_##_provider(); #undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE #define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \ - __tracepoint_provider_mismatch_##_provider(); + lttng_ust_tracepoint_provider_mismatch_##_provider(); static inline -void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) +void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace; static inline -void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) +void _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) { #include TRACEPOINT_INCLUDE } @@ -1127,14 +1127,14 @@ _TP_COMBINE_TOKENS(__lttng_ust_events_init__, TRACEPOINT_PROVIDER)(void) return; } /* - * __tracepoint_provider_check_ ## TRACEPOINT_PROVIDER() is a + * lttng_ust_tracepoint_provider_check_ ## 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. */ - _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(); + _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_check_, TRACEPOINT_PROVIDER)(); assert(!_TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER)); reg_probe = lttng_ust_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER)); if (!reg_probe) { @@ -1158,5 +1158,5 @@ _TP_COMBINE_TOKENS(__lttng_ust_events_exit__, TRACEPOINT_PROVIDER)(void) _TP_COMBINE_TOKENS(__lttng_ust_probe_register_cookie___, TRACEPOINT_PROVIDER) = NULL; } -int _TP_COMBINE_TOKENS(__tracepoint_provider_, TRACEPOINT_PROVIDER) +int _TP_COMBINE_TOKENS(lttng_ust_tracepoint_provider_, TRACEPOINT_PROVIDER) __attribute__((visibility("default"))); diff --git a/src/lib/lttng-ust-dl/lttng-ust-dl.c b/src/lib/lttng-ust-dl/lttng-ust-dl.c index 8470dfa3..0f01b356 100644 --- a/src/lib/lttng-ust-dl/lttng-ust-dl.c +++ b/src/lib/lttng-ust-dl/lttng-ust-dl.c @@ -207,7 +207,7 @@ void *dlopen(const char *filename, int flags) void *handle; handle = _lttng_ust_dl_libc_dlopen(filename, flags); - if (__tracepoint_ptrs_registered && handle) { + if (lttng_ust_tracepoint_ptrs_registered && handle) { struct link_map *p = NULL; int ret; @@ -227,7 +227,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags) void *handle; handle = _lttng_ust_dl_libc_dlmopen(nsid, filename, flags); - if (__tracepoint_ptrs_registered && handle) { + if (lttng_ust_tracepoint_ptrs_registered && handle) { struct link_map *p = NULL; int ret; @@ -248,7 +248,7 @@ int dlclose(void *handle) { int ret; - if (__tracepoint_ptrs_registered) { + if (lttng_ust_tracepoint_ptrs_registered) { struct link_map *p = NULL; ret = dlinfo(handle, RTLD_DI_LINKMAP, &p); diff --git a/src/lib/lttng-ust-tracepoint/tracepoint-weak-test.c b/src/lib/lttng-ust-tracepoint/tracepoint-weak-test.c index fcfb5838..cd423f71 100644 --- a/src/lib/lttng-ust-tracepoint/tracepoint-weak-test.c +++ b/src/lib/lttng-ust-tracepoint/tracepoint-weak-test.c @@ -7,23 +7,23 @@ #include "lib/lttng-ust-tracepoint/tracepoint.h" /* Test compiler support for weak symbols with hidden visibility. */ -int __tracepoint_test_symbol1 __attribute__((weak, visibility("hidden"))); -void *__tracepoint_test_symbol2 __attribute__((weak, visibility("hidden"))); +int lttng_ust_tracepoint_test_symbol1 __attribute__((weak, visibility("hidden"))); +void *lttng_ust_tracepoint_test_symbol2 __attribute__((weak, visibility("hidden"))); struct { char a[24]; -} __tracepoint_test_symbol3 __attribute__((weak, visibility("hidden"))); +} lttng_ust_tracepoint_test_symbol3 __attribute__((weak, visibility("hidden"))); void *lttng_ust_tp_check_weak_hidden1(void) { - return &__tracepoint_test_symbol1; + return <tng_ust_tracepoint_test_symbol1; } void *lttng_ust_tp_check_weak_hidden2(void) { - return &__tracepoint_test_symbol2; + return <tng_ust_tracepoint_test_symbol2; } void *lttng_ust_tp_check_weak_hidden3(void) { - return &__tracepoint_test_symbol3; + return <tng_ust_tracepoint_test_symbol3; } diff --git a/src/lib/lttng-ust-tracepoint/tracepoint.c b/src/lib/lttng-ust-tracepoint/tracepoint.c index 939af888..2e9a2c09 100644 --- a/src/lib/lttng-ust-tracepoint/tracepoint.c +++ b/src/lib/lttng-ust-tracepoint/tracepoint.c @@ -33,11 +33,11 @@ #include "common/err-ptr.h" /* Test compiler support for weak symbols with hidden visibility. */ -int __tracepoint_test_symbol1 __attribute__((weak, visibility("hidden"))); -void *__tracepoint_test_symbol2 __attribute__((weak, visibility("hidden"))); +int lttng_ust_tracepoint_test_symbol1 __attribute__((weak, visibility("hidden"))); +void *lttng_ust_tracepoint_test_symbol2 __attribute__((weak, visibility("hidden"))); struct { char a[24]; -} __tracepoint_test_symbol3 __attribute__((weak, visibility("hidden"))); +} lttng_ust_tracepoint_test_symbol3 __attribute__((weak, visibility("hidden"))); /* Set to 1 to enable tracepoint debug output */ static const int tracepoint_debug; @@ -608,7 +608,7 @@ static void tracepoint_release_queue_add_old_probes(void *old) } /** - * __tracepoint_probe_register - Connect a probe to a tracepoint + * lttng_ust_tracepoint_probe_register - Connect a probe to a tracepoint * @name: tracepoint provider name * @name: tracepoint event name * @probe: probe handler @@ -617,7 +617,7 @@ static void tracepoint_release_queue_add_old_probes(void *old) * The probe address must at least be aligned on the architecture pointer size. * Called with the tracepoint mutex held. */ -int __tracepoint_probe_register(const char *provider_name, const char *event_name, +int lttng_ust_tracepoint_probe_register(const char *provider_name, const char *event_name, void (*probe)(void), void *data, const char *signature) { void *old; @@ -640,7 +640,7 @@ end: } /* - * Caller needs to invoke __tracepoint_probe_release_queue() after + * Caller needs to invoke lttng_ust_tracepoint_probe_release_queue() after * calling lttng_ust_tp_probe_register_queue_release() one or multiple * times to ensure it does not leak memory. */ @@ -690,7 +690,7 @@ static void *tracepoint_remove_probe(const char *provider_name, const char *even * @probe: probe function pointer * @probe: probe data pointer */ -int __tracepoint_probe_unregister(const char *provider_name, const char *event_name, +int lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name, void (*probe)(void), void *data) { void *old; @@ -712,7 +712,7 @@ end: } /* - * Caller needs to invoke __tracepoint_probe_release_queue() after + * Caller needs to invoke lttng_ust_tracepoint_probe_release_queue() after * calling lttng_ust_tp_probe_unregister_queue_release() one or multiple * times to ensure it does not leak memory. */ @@ -968,15 +968,15 @@ int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_s static void check_weak_hidden(void) { DBG("Your compiler treats weak symbols with hidden visibility for integer objects as %s between compile units part of the same module.", - &__tracepoint_test_symbol1 == lttng_ust_tp_check_weak_hidden1() ? + <tng_ust_tracepoint_test_symbol1 == lttng_ust_tp_check_weak_hidden1() ? "SAME address" : "DIFFERENT addresses"); DBG("Your compiler treats weak symbols with hidden visibility for pointer objects as %s between compile units part of the same module.", - &__tracepoint_test_symbol2 == lttng_ust_tp_check_weak_hidden2() ? + <tng_ust_tracepoint_test_symbol2 == lttng_ust_tp_check_weak_hidden2() ? "SAME address" : "DIFFERENT addresses"); DBG("Your compiler treats weak symbols with hidden visibility for 24-byte structure objects as %s between compile units part of the same module.", - &__tracepoint_test_symbol3 == lttng_ust_tp_check_weak_hidden3() ? + <tng_ust_tracepoint_test_symbol3 == lttng_ust_tp_check_weak_hidden3() ? "SAME address" : "DIFFERENT addresses"); } diff --git a/src/lib/lttng-ust/tracef.c b/src/lib/lttng-ust/tracef.c index 3c4ce490..e48ef802 100644 --- a/src/lib/lttng-ust/tracef.c +++ b/src/lib/lttng-ust/tracef.c @@ -24,7 +24,7 @@ void __lttng_ust_vtracef(const char *fmt, va_list ap) /* len does not include the final \0 */ if (len < 0) goto end; - __tracepoint_cb_lttng_ust_tracef___event(msg, len, + lttng_ust_tracepoint_cb_lttng_ust_tracef___event(msg, len, LTTNG_UST_CALLER_IP()); free(msg); end: diff --git a/src/lib/lttng-ust/tracelog.c b/src/lib/lttng-ust/tracelog.c index 735d04a9..28a3e1ac 100644 --- a/src/lib/lttng-ust/tracelog.c +++ b/src/lib/lttng-ust/tracelog.c @@ -30,7 +30,7 @@ /* len does not include the final \0 */ \ if (len < 0) \ goto end; \ - __tracepoint_cb_lttng_ust_tracelog___##level(file, \ + lttng_ust_tracepoint_cb_lttng_ust_tracelog___##level(file, \ line, func, msg, len, \ LTTNG_UST_CALLER_IP()); \ free(msg); \ -- 2.34.1