X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-compiler.h;h=51491a5f1628f44b79252df8aa71e95b44c3338c;hb=801389e72071c861c0ccf32bdca4ec5c424585b5;hp=f0ec8d0c41d86a73304f3a23b495840168d12537;hpb=9f5ade14faf36df6429d9c6e1d0360854a5669d0;p=lttng-ust.git

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index f0ec8d0c..51491a5f 100644
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -32,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
 
@@ -44,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
 
 /*
@@ -65,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.
@@ -79,8 +82,65 @@
  * 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
+
+/* 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
+ * 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_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_,      \
+				   name) {					\
+public:										\
+	LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() __VA_ARGS__; \
+	~LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() __VA_ARGS__; \
+};										\
+LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)::LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() \
+{										\
+	constructor_func();							\
+}										\
+LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)::~LTTNG_UST_COMPILER_COMBINE_TOKENS(lttng_ust_constructor_destructor_, name)() \
+{										\
+	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_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
 
 #endif /* _LTTNG_UST_COMPILER_H */