X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-compiler.h;h=c938361d496ed84e1b924f0e69da489b8e3893f9;hb=05bfa3dc3a6e6b2ece3686a5f384b6645c2a5010;hp=e7d72e0da3fd21843b8caa0879200a4c43c38f21;hpb=7f2640686401c087210073de0631caa0a1ee4fbe;p=lttng-ust.git diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h index e7d72e0d..c938361d 100644 --- a/include/lttng/ust-compiler.h +++ b/include/lttng/ust-compiler.h @@ -1,33 +1,16 @@ -#ifndef _LTTNG_UST_COMPILER_H -#define _LTTNG_UST_COMPILER_H - /* - * Copyright 2011-2012 - Mathieu Desnoyers - * Paul Woegerer + * SPDX-License-Identifier: MIT * - * 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. + * Copyright (C) 2011-2012 Mathieu Desnoyers + * Copyright (C) 2011-2012 Paul Woegerer */ +#ifndef _LTTNG_UST_COMPILER_H +#define _LTTNG_UST_COMPILER_H + #include #define lttng_ust_notrace __attribute__((no_instrument_function)) -#define LTTNG_PACKED __attribute__((__packed__)) /* * Clang supports the no_sanitize variable attribute on global variables. @@ -49,10 +32,10 @@ * g++ 4.8 and prior do not support C99 compound literals. Therefore, * force allocating those on the heap with these C++ compilers. */ -#if defined (__cplusplus) && defined (__GNUC__) && \ - (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8)) -# ifndef LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP -# define LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP +#if defined (__cplusplus) && !defined (__clang__) && defined (__GNUC__) && \ + ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))) +# ifndef LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP +# define LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP # endif #endif @@ -61,16 +44,16 @@ * Compound literals are part of the C99 and C11 standards, but not * part of the C++ standards. However, those are supported by both g++ and * clang. In order to be strictly C++11 compliant, defining - * LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP before including this header + * LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP before including this header * allocates those on the heap in C++. * * Example use: - * static struct mystruct *var = __LTTNG_COMPOUND_LITERAL(struct mystruct, { 1, 2, 3 }); + * static struct mystruct *var = LTTNG_UST_COMPOUND_LITERAL(struct mystruct, { 1, 2, 3 }); */ -#if defined (__cplusplus) && defined (LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP) -#define __LTTNG_COMPOUND_LITERAL(type, ...) new (type) __VA_ARGS__ +#if defined (__cplusplus) && defined (LTTNG_UST_ALLOCATE_COMPOUND_LITERAL_ON_HEAP) +#define LTTNG_UST_COMPOUND_LITERAL(type, ...) new (type) __VA_ARGS__ #else -#define __LTTNG_COMPOUND_LITERAL(type, ...) (type[]) { __VA_ARGS__ } +#define LTTNG_UST_COMPOUND_LITERAL(type, ...) (type[]) { __VA_ARGS__ } #endif /* @@ -82,9 +65,12 @@ * static assertion. This parameter must be a valid C identifier as it will * be used as a typedef name. */ -#if defined (__cplusplus) || __STDC_VERSION__ >= 201112L -#define lttng_static_assert(predicate, msg, c_identifier_msg) \ +#ifdef __cplusplus +#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \ static_assert(predicate, msg) +#elif __STDC_VERSION__ >= 201112L +#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \ + _Static_assert(predicate, msg) #else /* * Evaluates the predicate and emit a compilation error on failure. @@ -96,8 +82,60 @@ * of negative size which is invalid in C and forces a compiler error. The msg * parameter is used in the tentative typedef so it is printed to the user. */ -#define lttng_static_assert(predicate, msg, c_identifier_msg) \ - typedef char lttng_static_assert_##c_identifier_msg[2*!!(predicate)-1]; +#define lttng_ust_static_assert(predicate, msg, c_identifier_msg) \ + typedef char lttng_ust_static_assert_##c_identifier_msg[2*!!(predicate)-1] +#endif + +/* + * Wrap constructor and destructor functions to invoke them as functions with + * the constructor/destructor GNU C attributes when building as C, or as the + * constructor/destructor of a variable defined within an anonymous namespace + * 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); \ +} +#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(); \ + } #endif #endif /* _LTTNG_UST_COMPILER_H */