X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-compiler.h;h=c938361d496ed84e1b924f0e69da489b8e3893f9;hb=90fe47efbc1c04348f65186455aaa3bef2dbccae;hp=7c858f87fb03bc5ce095797dc768eb32abed0d38;hpb=b4c54822d66aaf7bc10fe27cb8bfd8622b370d6b;p=lttng-ust.git

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index 7c858f87..c938361d 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
+#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.
@@ -83,4 +86,56 @@
     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 */