X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=48781e8ebcf01de30106fa3f78fc52e88f65cf09;hb=0274f7f24e55825f2a51804d50100676d468c06d;hp=51eafdeb5a4cce36e957ede0d5af31557fb5d803;hpb=05e8ff1f80c9a6dcd7db559c7a39b4c46e85e2a7;p=lttng-ust.git diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 51eafdeb..48781e8e 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -1,28 +1,12 @@ -#ifndef _LTTNG_TRACEPOINT_H -#define _LTTNG_TRACEPOINT_H - /* - * Copyright 2011-2012 - Mathieu Desnoyers - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * SPDX-License-Identifier: MIT + * + * Copyright (C) 2011-2012 Mathieu Desnoyers */ +#ifndef _LTTNG_TRACEPOINT_H +#define _LTTNG_TRACEPOINT_H + #include #include #include @@ -31,8 +15,13 @@ #include #include /* for dlopen */ #include /* for memset */ + #include /* for sdt */ #include +#include +#include + +#define LTTNG_UST_TRACEPOINT_NAME_LEN_MAX 256 #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION /* @@ -42,42 +31,42 @@ */ #include -#define _LTTNG_SDT_NARG(...) \ - __LTTNG_SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0) +#define _LTTNG_UST_SDT_NARG(...) \ + __LTTNG_UST_SDT_NARG(__VA_ARGS__, 12,11,10,9,8,7,6,5,4,3,2,1,0) -#define __LTTNG_SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N +#define __LTTNG_UST_SDT_NARG(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12, N, ...) N -#define _LTTNG_SDT_PROBE_N(provider, name, N, ...) \ +#define _LTTNG_UST_SDT_PROBE_N(provider, name, N, ...) \ _SDT_PROBE(provider, name, N, (__VA_ARGS__)) -#define LTTNG_STAP_PROBEV(provider, name, ...) \ - _LTTNG_SDT_PROBE_N(provider, name, _LTTNG_SDT_NARG(0, ##__VA_ARGS__), ##__VA_ARGS__) +#define LTTNG_UST_STAP_PROBEV(provider, name, ...) \ + _LTTNG_UST_SDT_PROBE_N(provider, name, _LTTNG_UST_SDT_NARG(0, ##__VA_ARGS__), ##__VA_ARGS__) #else -#define LTTNG_STAP_PROBEV(...) +#define LTTNG_UST_STAP_PROBEV(...) #endif #ifdef __cplusplus extern "C" { #endif -#define tracepoint_enabled(provider, name) \ - caa_unlikely(CMM_LOAD_SHARED(__tracepoint_##provider##___##name.state)) +#define lttng_ust_tracepoint_enabled(provider, name) \ + caa_unlikely(CMM_LOAD_SHARED(lttng_ust_tracepoint_##provider##___##name.state)) -#define do_tracepoint(provider, name, ...) \ - __tracepoint_cb_##provider##___##name(__VA_ARGS__) +#define lttng_ust_do_tracepoint(provider, name, ...) \ + lttng_ust_tracepoint_cb_##provider##___##name(__VA_ARGS__) -#define tracepoint(provider, name, ...) \ - do { \ - LTTNG_STAP_PROBEV(provider, name, ## __VA_ARGS__); \ - if (tracepoint_enabled(provider, name)) \ - do_tracepoint(provider, name, __VA_ARGS__); \ +#define lttng_ust_tracepoint(provider, name, ...) \ + do { \ + LTTNG_UST_STAP_PROBEV(provider, name, ## __VA_ARGS__); \ + if (lttng_ust_tracepoint_enabled(provider, name)) \ + lttng_ust_do_tracepoint(provider, name, __VA_ARGS__); \ } while (0) -#define TP_ARGS(...) __VA_ARGS__ +#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__ /* - * TP_ARGS takes tuples of type, argument separated by a comma. + * LTTNG_UST_TP_ARGS takes tuples of type, argument separated by a comma. * It can take up to 10 tuples (which means that less than 10 tuples is * fine too). * Each tuple is also separated by a comma. @@ -168,24 +157,44 @@ extern "C" { #define _TP_ARGS_DATA_VAR(...) _TP_DATA_VAR_N(_TP_NARGS(0, ##__VA_ARGS__), ##__VA_ARGS__) #define _TP_PARAMS(...) __VA_ARGS__ +/* + * sizeof(#_provider) - 1 : length of the provider string (excluding \0). + * sizeof(#_name) - 1 : length of the name string (excluding \0). + * + 1 : separator between provider and event name. + * + * Upper bound (inclusive) is LTTNG_UST_TRACEPOINT_NAME_LEN_MAX - 1 to + * account for \0. + * + * The comparison is: + * left hand side: sizeof(#_provider) - 1 + sizeof(#_name) - 1 + 1 + * right hand side: LTTNG_UST_TRACEPOINT_NAME_LEN_MAX - 1 + * operator: <= (inclusive) + * Simplified in the code below. + */ +#define lttng_ust_tracepoint_validate_name_len(_provider, _name) \ + lttng_ust_static_assert(sizeof(#_provider) + sizeof(#_name) <= LTTNG_UST_TRACEPOINT_NAME_LEN_MAX, \ + "Tracepoint name length is too long", \ + Tracepoint_name_length_is_too_long) + /* * The tracepoint cb is marked always inline so we can distinguish * between caller's ip addresses within the probe using the return * address. */ -#define _DECLARE_TRACEPOINT(_provider, _name, ...) \ -extern struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name; \ -static inline __attribute__((always_inline, unused)) lttng_ust_notrace \ -void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)); \ +#define LTTNG_UST__DECLARE_TRACEPOINT(_provider, _name, ...) \ +extern struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name; \ +static inline \ +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 { \ @@ -198,36 +207,48 @@ void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ end: \ tp_rcu_read_unlock(); \ } \ -static inline lttng_ust_notrace \ -void __tracepoint_register_##_provider##___##_name(char *name, \ - void (*func)(void), void *data); \ static inline \ -void __tracepoint_register_##_provider##___##_name(char *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 lttng_ust_tracepoint_register_##_provider##___##_name(char *provider_name, char *event_name, \ void (*func)(void), void *data) \ { \ - __tracepoint_probe_register(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 lttng_ust_notrace \ -void __tracepoint_unregister_##_provider##___##_name(char *name, \ - void (*func)(void), void *data); \ static inline \ -void __tracepoint_unregister_##_provider##___##_name(char *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 lttng_ust_tracepoint_unregister_##_provider##___##_name(char *provider_name, char *event_name, \ void (*func)(void), void *data) \ { \ - __tracepoint_probe_unregister(name, func, data); \ + lttng_ust_tracepoint_probe_unregister(provider_name, event_name, func, data); \ } -extern int __tracepoint_probe_register(const char *name, void (*func)(void), - void *data, const char *signature); -extern int __tracepoint_probe_unregister(const char *name, void (*func)(void), - void *data); +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 lttng_ust_tracepoint_probe_unregister(const char *provider_name, const char *event_name, + void (*func)(void), void *data); /* * tracepoint dynamic linkage handling (callbacks). Hidden visibility: * shared across objects in a module/main executable. + * + * IMPORTANT: this structure is part of the ABI between instrumented + * applications and UST. Fields need to be only added at the end, never + * reordered, never removed. + * + * The field @struct_size should be used to determine the size of the + * structure. It should be queried before using additional fields added + * at the end of the structure. */ struct lttng_ust_tracepoint_dlopen { + uint32_t struct_size; + void *liblttngust_handle; int (*tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start, @@ -236,22 +257,26 @@ struct lttng_ust_tracepoint_dlopen { void (*rcu_read_lock_sym)(void); void (*rcu_read_unlock_sym)(void); void *(*rcu_dereference_sym)(void *p); + + /* End of base ABI. Fields below should be used after checking struct_size. */ }; -extern struct lttng_ust_tracepoint_dlopen tracepoint_dlopen; -extern struct lttng_ust_tracepoint_dlopen *tracepoint_dlopen_ptr; +extern struct lttng_ust_tracepoint_dlopen lttng_ust_tracepoint_dlopen; +extern struct lttng_ust_tracepoint_dlopen *lttng_ust_tracepoint_dlopen_ptr; /* * These weak symbols, the constructor, and destructor take care of * registering only _one_ instance of the tracepoints per shared-ojbect * (or for the whole main program). */ -int __tracepoint_registered - __attribute__((weak, visibility("hidden"))); -int __tracepoint_ptrs_registered +int lttng_ust_tracepoint_registered __attribute__((weak, visibility("hidden"))); -struct lttng_ust_tracepoint_dlopen tracepoint_dlopen +int lttng_ust_tracepoint_ptrs_registered __attribute__((weak, visibility("hidden"))); +struct lttng_ust_tracepoint_dlopen lttng_ust_tracepoint_dlopen + __attribute__((weak, visibility("hidden"))) = { + .struct_size = sizeof(struct lttng_ust_tracepoint_dlopen), +}; /* * Deal with gcc O1 optimisation issues with weak hidden symbols. gcc * 4.8 and prior does not have the same behavior for symbol scoping on @@ -262,121 +287,137 @@ struct lttng_ust_tracepoint_dlopen tracepoint_dlopen * scoping match that of the other weak hidden symbols found in this * header. */ -struct lttng_ust_tracepoint_dlopen *tracepoint_dlopen_ptr +struct lttng_ust_tracepoint_dlopen *lttng_ust_tracepoint_dlopen_ptr __attribute__((weak, visibility("hidden"))); /* * Tracepoint dynamic linkage handling (callbacks). Hidden visibility: shared * across objects in a module/main executable. The callbacks are used to * control and check if the destructors should be executed. + * + * IMPORTANT: this structure is part of the ABI between instrumented + * applications and UST. Fields need to be only added at the end, never + * reordered, never removed. + * + * The field @struct_size should be used to determine the size of the + * structure. It should be queried before using additional fields added + * at the end of the structure. */ struct lttng_ust_tracepoint_destructors_syms { - int *old_tracepoint_disable_destructors; + uint32_t struct_size; + void (*tracepoint_disable_destructors)(void); int (*tracepoint_get_destructors_state)(void); + + /* End of base ABI. Fields below should be used after checking struct_size. */ }; -extern struct lttng_ust_tracepoint_destructors_syms tracepoint_destructors_syms; -extern struct lttng_ust_tracepoint_destructors_syms *tracepoint_destructors_syms_ptr; +extern struct lttng_ust_tracepoint_destructors_syms lttng_ust_tracepoint_destructors_syms; +extern struct lttng_ust_tracepoint_destructors_syms *lttng_ust_tracepoint_destructors_syms_ptr; -struct lttng_ust_tracepoint_destructors_syms tracepoint_destructors_syms - __attribute__((weak, visibility("hidden"))); -struct lttng_ust_tracepoint_destructors_syms *tracepoint_destructors_syms_ptr +struct lttng_ust_tracepoint_destructors_syms lttng_ust_tracepoint_destructors_syms + __attribute__((weak, visibility("hidden"))) = { + .struct_size = sizeof(struct lttng_ust_tracepoint_destructors_syms), +}; +struct lttng_ust_tracepoint_destructors_syms *lttng_ust_tracepoint_destructors_syms_ptr __attribute__((weak, visibility("hidden"))); static inline void tracepoint_disable_destructors(void) { - if (!tracepoint_dlopen_ptr) - tracepoint_dlopen_ptr = &tracepoint_dlopen; - if (!tracepoint_destructors_syms_ptr) - tracepoint_destructors_syms_ptr = &tracepoint_destructors_syms; - if (tracepoint_dlopen_ptr->liblttngust_handle - && tracepoint_destructors_syms_ptr->tracepoint_disable_destructors) - tracepoint_destructors_syms_ptr->tracepoint_disable_destructors(); - *tracepoint_destructors_syms_ptr->old_tracepoint_disable_destructors = 1; + if (!lttng_ust_tracepoint_dlopen_ptr) + lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; + if (!lttng_ust_tracepoint_destructors_syms_ptr) + lttng_ust_tracepoint_destructors_syms_ptr = <tng_ust_tracepoint_destructors_syms; + if (lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle + && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors) + lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors(); } #ifndef _LGPL_SOURCE -static inline void lttng_ust_notrace -__tracepoint__init_urcu_sym(void); static inline void -__tracepoint__init_urcu_sym(void) +lttng_ust_tracepoint__init_urcu_sym(void) + lttng_ust_notrace; +static inline void +lttng_ust_tracepoint__init_urcu_sym(void) { - if (!tracepoint_dlopen_ptr) - tracepoint_dlopen_ptr = &tracepoint_dlopen; + if (!lttng_ust_tracepoint_dlopen_ptr) + lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; /* * Symbols below are needed by tracepoint call sites and probe * providers. */ - if (!tracepoint_dlopen_ptr->rcu_read_lock_sym) - tracepoint_dlopen_ptr->rcu_read_lock_sym = + if (!lttng_ust_tracepoint_dlopen_ptr->rcu_read_lock_sym) + lttng_ust_tracepoint_dlopen_ptr->rcu_read_lock_sym = URCU_FORCE_CAST(void (*)(void), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "tp_rcu_read_lock")); - if (!tracepoint_dlopen_ptr->rcu_read_unlock_sym) - tracepoint_dlopen_ptr->rcu_read_unlock_sym = + if (!lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym) + lttng_ust_tracepoint_dlopen_ptr->rcu_read_unlock_sym = URCU_FORCE_CAST(void (*)(void), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "tp_rcu_read_unlock")); - if (!tracepoint_dlopen_ptr->rcu_dereference_sym) - tracepoint_dlopen_ptr->rcu_dereference_sym = + if (!lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym) + lttng_ust_tracepoint_dlopen_ptr->rcu_dereference_sym = URCU_FORCE_CAST(void *(*)(void *p), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "tp_rcu_dereference_sym")); } #else -static inline void lttng_ust_notrace -__tracepoint__init_urcu_sym(void); static inline void -__tracepoint__init_urcu_sym(void) +lttng_ust_tracepoint__init_urcu_sym(void) + lttng_ust_notrace; +static inline void +lttng_ust_tracepoint__init_urcu_sym(void) { } #endif -static void lttng_ust_notrace __attribute__((constructor)) -__tracepoints__init(void); +static void +__tracepoints__init(void) + lttng_ust_notrace __attribute__((constructor)); static void __tracepoints__init(void) { - if (__tracepoint_registered++) { - if (!tracepoint_dlopen_ptr->liblttngust_handle) + 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; } - if (!tracepoint_dlopen_ptr) - tracepoint_dlopen_ptr = &tracepoint_dlopen; - if (!tracepoint_dlopen_ptr->liblttngust_handle) - tracepoint_dlopen_ptr->liblttngust_handle = - dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL); - if (!tracepoint_dlopen_ptr->liblttngust_handle) + if (!lttng_ust_tracepoint_dlopen_ptr) + lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; + if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) + lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle = + 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 lttng_ust_notrace __attribute__((destructor)) -__tracepoints__destroy(void); +static void +__tracepoints__destroy(void) + lttng_ust_notrace __attribute__((destructor)); static void __tracepoints__destroy(void) { int ret; - if (--__tracepoint_registered) + if (--lttng_ust_tracepoint_registered) return; - if (!tracepoint_dlopen_ptr) - tracepoint_dlopen_ptr = &tracepoint_dlopen; - if (!tracepoint_destructors_syms_ptr) - tracepoint_destructors_syms_ptr = &tracepoint_destructors_syms; - if (!tracepoint_dlopen_ptr->liblttngust_handle) + if (!lttng_ust_tracepoint_dlopen_ptr) + lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; + if (!lttng_ust_tracepoint_destructors_syms_ptr) + 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. */ - if (tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state - && !tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state()) { + if (lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state + && !lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state()) { /* * The tracepoint_get_destructors_state symbol was found with * dlsym but its returned value is 0 meaning that destructors @@ -384,25 +425,12 @@ __tracepoints__destroy(void) */ return; } - /* - * Lookup if destructors must be executed using the old method. - */ - if (tracepoint_destructors_syms_ptr->old_tracepoint_disable_destructors - && *tracepoint_destructors_syms_ptr->old_tracepoint_disable_destructors) { - /* - * The old_tracepoint_disable_destructors symbol was found with - * dlsym but its value is 1 meaning that destructors must not - * be executed. - */ - return; - } - - ret = dlclose(tracepoint_dlopen_ptr->liblttngust_handle); + ret = dlclose(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle); if (ret) { fprintf(stderr, "Error (%d) in dlclose\n", ret); abort(); } - memset(tracepoint_dlopen_ptr, 0, sizeof(*tracepoint_dlopen_ptr)); + memset(lttng_ust_tracepoint_dlopen_ptr, 0, sizeof(*lttng_ust_tracepoint_dlopen_ptr)); } #ifdef TRACEPOINT_DEFINE @@ -429,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 */ /* @@ -439,105 +467,115 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[] */ #define _TP_EXTRACT_STRING(...) #__VA_ARGS__ -#define _DEFINE_TRACEPOINT(_provider, _name, _args) \ - extern int __tracepoint_provider_##_provider; \ - static const char __tp_strtab_##_provider##___##_name[] \ +#define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args) \ + lttng_ust_tracepoint_validate_name_len(_provider, _name); \ + 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"))) = \ - #_provider ":" #_name; \ - struct lttng_ust_tracepoint __tracepoint_##_provider##___##_name \ - __attribute__((section("__tracepoints"))) = \ - { \ - __tp_strtab_##_provider##___##_name, \ + #_name; \ + struct lttng_ust_tracepoint lttng_ust_tracepoint_##_provider##___##_name \ + __attribute__((section("__tracepoints"))) = { \ + sizeof(struct lttng_ust_tracepoint), \ + __tp_provider_strtab_##_provider##___##_name, \ + __tp_name_strtab_##_provider##___##_name, \ 0, \ NULL, \ _TRACEPOINT_UNDEFINED_REF(_provider), \ _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 lttng_ust_notrace __attribute__((constructor)) -__tracepoints__ptrs_init(void); +static void +__tracepoints__ptrs_init(void) + lttng_ust_notrace __attribute__((constructor)); static void __tracepoints__ptrs_init(void) { - if (__tracepoint_ptrs_registered++) + if (lttng_ust_tracepoint_ptrs_registered++) return; - if (!tracepoint_dlopen_ptr) - tracepoint_dlopen_ptr = &tracepoint_dlopen; - if (!tracepoint_dlopen_ptr->liblttngust_handle) - tracepoint_dlopen_ptr->liblttngust_handle = - dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL); - if (!tracepoint_dlopen_ptr->liblttngust_handle) + if (!lttng_ust_tracepoint_dlopen_ptr) + lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; + if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) + lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle = + dlopen(LTTNG_UST_TRACEPOINT_LIB_SONAME, RTLD_NOW | RTLD_GLOBAL); + if (!lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle) return; - if (!tracepoint_destructors_syms_ptr) - tracepoint_destructors_syms_ptr = &tracepoint_destructors_syms; - tracepoint_dlopen_ptr->tracepoint_register_lib = + if (!lttng_ust_tracepoint_destructors_syms_ptr) + lttng_ust_tracepoint_destructors_syms_ptr = <tng_ust_tracepoint_destructors_syms; + lttng_ust_tracepoint_dlopen_ptr->tracepoint_register_lib = URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, - "tracepoint_register_lib2")); - tracepoint_dlopen_ptr->tracepoint_unregister_lib = + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, + "tracepoint_register_lib")); + lttng_ust_tracepoint_dlopen_ptr->tracepoint_unregister_lib = URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, - "tracepoint_unregister_lib2")); - tracepoint_destructors_syms_ptr->old_tracepoint_disable_destructors = - URCU_FORCE_CAST(int *, - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, - "__tracepoints__disable_destructors")); - tracepoint_destructors_syms_ptr->tracepoint_disable_destructors = + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, + "tracepoint_unregister_lib")); + lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors = URCU_FORCE_CAST(void (*)(void), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "tp_disable_destructors")); - tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state = + lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state = URCU_FORCE_CAST(int (*)(void), - dlsym(tracepoint_dlopen_ptr->liblttngust_handle, + dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "tp_get_destructors_state")); - __tracepoint__init_urcu_sym(); - if (tracepoint_dlopen_ptr->tracepoint_register_lib) { - tracepoint_dlopen_ptr->tracepoint_register_lib(__start___tracepoints_ptrs, + 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 - __start___tracepoints_ptrs); } } -static void lttng_ust_notrace __attribute__((destructor)) -__tracepoints__ptrs_destroy(void); +static void +__tracepoints__ptrs_destroy(void) + lttng_ust_notrace __attribute__((destructor)); static void __tracepoints__ptrs_destroy(void) { int ret; - if (--__tracepoint_ptrs_registered) + if (--lttng_ust_tracepoint_ptrs_registered) return; - if (!tracepoint_dlopen_ptr) - tracepoint_dlopen_ptr = &tracepoint_dlopen; - if (!tracepoint_destructors_syms_ptr) - tracepoint_destructors_syms_ptr = &tracepoint_destructors_syms; - if (tracepoint_dlopen_ptr->tracepoint_unregister_lib) - tracepoint_dlopen_ptr->tracepoint_unregister_lib(__start___tracepoints_ptrs); - if (tracepoint_dlopen_ptr->liblttngust_handle - && tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state - && tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state() - && !__tracepoint_ptrs_registered) { - ret = dlclose(tracepoint_dlopen_ptr->liblttngust_handle); + if (!lttng_ust_tracepoint_dlopen_ptr) + lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; + if (!lttng_ust_tracepoint_destructors_syms_ptr) + lttng_ust_tracepoint_destructors_syms_ptr = <tng_ust_tracepoint_destructors_syms; + if (lttng_ust_tracepoint_dlopen_ptr->tracepoint_unregister_lib) + lttng_ust_tracepoint_dlopen_ptr->tracepoint_unregister_lib(__start___tracepoints_ptrs); + 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() + && !lttng_ust_tracepoint_ptrs_registered) { + ret = dlclose(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle); if (ret) { fprintf(stderr, "Error (%d) in dlclose\n", ret); abort(); } - memset(tracepoint_dlopen_ptr, 0, sizeof(*tracepoint_dlopen_ptr)); + memset(lttng_ust_tracepoint_dlopen_ptr, 0, sizeof(*lttng_ust_tracepoint_dlopen_ptr)); } } #else /* TRACEPOINT_DEFINE */ -#define _DEFINE_TRACEPOINT(_provider, _name, _args) +#define LTTNG_UST__DEFINE_TRACEPOINT(_provider, _name, _args) #endif /* #else TRACEPOINT_DEFINE */ +#if LTTNG_UST_COMPAT_API(0) +#define tracepoint lttng_ust_tracepoint +#define do_tracepoint lttng_ust_do_tracepoint +#define tracepoint_enabled lttng_ust_tracepoint_enabled +#define TP_ARGS LTTNG_UST_TP_ARGS +#define TP_FIELDS LTTNG_UST_TP_FIELDS +#endif /* #if LTTNG_UST_COMPAT_API(0) */ + #ifdef __cplusplus } #endif @@ -590,23 +628,23 @@ __tracepoints__ptrs_destroy(void) #endif /* #ifndef TRACEPOINT_ENUM */ -#ifndef TRACEPOINT_EVENT +#ifndef LTTNG_UST_TRACEPOINT_EVENT /* - * How to use the TRACEPOINT_EVENT macro: + * How to use the LTTNG_UST_TRACEPOINT_EVENT macro: * * An example: * - * TRACEPOINT_EVENT(someproject_component, event_name, + * LTTNG_UST_TRACEPOINT_EVENT(someproject_component, event_name, * - * * TP_ARGS takes from 0 to 10 "type, field_name" pairs * + * * LTTNG_UST_TP_ARGS takes from 0 to 10 "type, field_name" pairs * * - * TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen, + * LTTNG_UST_TP_ARGS(int, arg0, void *, arg1, char *, string, size_t, strlen, * long *, arg4, size_t, arg4_len), * - * * TP_FIELDS describes the event payload layout in the trace * + * * LTTNG_UST_TP_FIELDS describes the event payload layout in the trace * * - * TP_FIELDS( + * LTTNG_UST_TP_FIELDS( * * Integer, printed in base 10 * * ctf_integer(int, field_a, arg0) * @@ -674,17 +712,23 @@ __tracepoints__ptrs_destroy(void) * the provider:event identifier is limited to 127 characters. */ -#define TRACEPOINT_EVENT(provider, name, args, fields) \ - _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args)) \ - _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args)) +#define LTTNG_UST_TRACEPOINT_EVENT(provider, name, args, fields) \ + LTTNG_UST__DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args)) \ + LTTNG_UST__DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args)) + +#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields) -#define TRACEPOINT_EVENT_CLASS(provider, name, args, fields) +#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args) \ + LTTNG_UST__DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args)) \ + LTTNG_UST__DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args)) -#define TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args) \ - _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args)) \ - _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args)) +#if LTTNG_UST_COMPAT_API(0) +#define TRACEPOINT_EVENT LTTNG_UST_TRACEPOINT_EVENT +#define TRACEPOINT_EVENT_CLASS LTTNG_UST_TRACEPOINT_EVENT_CLASS +#define TRACEPOINT_EVENT_INSTANCE LTTNG_UST_TRACEPOINT_EVENT_INSTANCE +#endif /* #if LTTNG_UST_COMPAT_API(0) */ -#endif /* #ifndef TRACEPOINT_EVENT */ +#endif /* #ifndef LTTNG_UST_TRACEPOINT_EVENT */ #ifndef TRACEPOINT_LOGLEVEL @@ -740,12 +784,12 @@ __tracepoints__ptrs_destroy(void) * debug information with function-level scope * * TRACE_DEBUG_LINE 13 - * debug information with line-level scope (TRACEPOINT_EVENT default) + * debug information with line-level scope (LTTNG_UST_TRACEPOINT_EVENT default) * * TRACE_DEBUG 14 * debug-level message * - * Declare tracepoint loglevels for tracepoints. A TRACEPOINT_EVENT + * Declare tracepoint loglevels for tracepoints. A LTTNG_UST_TRACEPOINT_EVENT * should be declared prior to the the TRACEPOINT_LOGLEVEL for a given * tracepoint name. The first field is the provider name, the second * field is the name of the tracepoint, the third field is the loglevel