From: Mathieu Desnoyers Date: Thu, 9 Dec 2021 20:40:19 +0000 (-0500) Subject: ust-compiler: constructor/destructor whitespaces layout and macro dependency X-Git-Tag: v2.13.1~2 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a5868ac0bb84b61b50fb7bb18a224c99e7990a9b;p=lttng-ust.git ust-compiler: constructor/destructor whitespaces layout and macro dependency Introduce LTTNG_UST_COMPILER_COMBINE_TOKENS in lttng/ust-compiler.h to eliminate a circular dependency from ust-compiler.h to LTTNG_UST__TP_COMBINE_TOKENS (defined in tracepoint.h). Use it in LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR. Change the layout of LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR to use tabs rather than spaces. Signed-off-by: Mathieu Desnoyers Change-Id: I71ecac349a1425401df62eb600ee74f4f930da09 --- diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h index c938361d..6ce2b652 100644 --- a/include/lttng/ust-compiler.h +++ b/include/lttng/ust-compiler.h @@ -86,6 +86,11 @@ typedef char lttng_ust_static_assert_##c_identifier_msg[2*!!(predicate)-1] #endif +/* Combine two tokens. */ +#define LTTNG_UST_COMPILER__COMBINE_TOKENS(_tokena, _tokenb) \ + _tokena##_tokenb +#define LTTNG_UST_COMPILER_COMBINE_TOKENS(_tokena, _tokenb) \ + LTTNG_UST_COMPILER__COMBINE_TOKENS(_tokena, _tokenb) /* * Wrap constructor and destructor functions to invoke them as functions with * the constructor/destructor GNU C attributes when building as C, or as the @@ -93,48 +98,48 @@ * when building as C++. */ #ifdef __cplusplus -#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func, \ - destructor_func, ...) \ -namespace lttng { \ -namespace ust { \ -namespace details { \ -class LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_destructor_, \ - name) { \ -public: \ - LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_destructor_, \ - name)() __VA_ARGS__ \ - { \ - constructor_func(); \ - } \ - ~LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_destructor_, \ - name)() __VA_ARGS__ \ - { \ - destructor_func(); \ - } \ -}; \ -} \ -} \ -} \ - \ -namespace { \ -const lttng::ust::details::LTTNG_UST__TP_COMBINE_TOKENS( \ - lttng_ust_constructor_destructor_, name) \ - LTTNG_UST__TP_COMBINE_TOKENS(name, registration_instance); \ +#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func, \ + destructor_func, ...) \ +namespace lttng { \ +namespace ust { \ +namespace details { \ +class LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, \ + name) { \ +public: \ + LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, \ + name)() __VA_ARGS__ \ + { \ + constructor_func(); \ + } \ + ~LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, \ + name)() __VA_ARGS__ \ + { \ + destructor_func(); \ + } \ +}; \ +} \ +} \ +} \ + \ +namespace { \ +const lttng::ust::details::LTTNG_UST_COMPILER_COMBINE_TOKENS( \ + lttng_ust_constructor_destructor_, name) \ + LTTNG_UST_COMPILER_COMBINE_TOKENS(name, registration_instance); \ } #else /* __cplusplus */ -#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func, \ - destructor_func, ...) \ - static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \ - __attribute__((constructor)) __VA_ARGS__; \ - static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \ - { \ - constructor_func(); \ - } \ - static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_destructor_, name)(void) \ - __attribute__((destructor)) __VA_ARGS__; \ - static void LTTNG_UST__TP_COMBINE_TOKENS(lttng_ust_destructor_, name)(void) \ - { \ - destructor_func(); \ +#define LTTNG_UST_DECLARE_CONSTRUCTOR_DESTRUCTOR(name, constructor_func, \ + destructor_func, ...) \ + static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \ + __attribute__((constructor)) __VA_ARGS__; \ + static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_, name)(void) \ + { \ + constructor_func(); \ + } \ + static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_destructor_, name)(void) \ + __attribute__((destructor)) __VA_ARGS__; \ + static void LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_destructor_, name)(void) \ + { \ + destructor_func(); \ } #endif