X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.hpp;h=cfe6eb5289d637ef1f1d1ddafe1b2f808a78535a;hb=7d1f4920efe33a4d025b9ba632ffbe73557d9636;hp=a4ff6504d078807056330c4fd8f3e25b3a05f2ad;hpb=f12e33ba4926d519a81baa388384fc54afde3985;p=lttng-tools.git

diff --git a/src/common/macros.hpp b/src/common/macros.hpp
index a4ff6504d..cfe6eb528 100644
--- a/src/common/macros.hpp
+++ b/src/common/macros.hpp
@@ -15,6 +15,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <memory>
+#include <pthread.h>
 #include <type_traits>
 
 /*
@@ -227,14 +229,6 @@ void *memmove(T *d, const U *s, size_t n) = delete;
 #define ARRAY_SIZE(array)   (sizeof(array) / (sizeof((array)[0])))
 #endif
 
-#ifndef container_of
-#define container_of(ptr, type, member)					\
-	({								\
-		const typeof(((type *)NULL)->member) * __ptr = (ptr);	\
-		(type *)((char *)__ptr - offsetof(type, member));	\
-	})
-#endif
-
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
@@ -271,6 +265,9 @@ void *memmove(T *d, const U *s, size_t n) = delete;
 # define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
 	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
 # define DIAGNOSTIC_IGNORE_LOGICAL_OP
+# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
+# define DIAGNOSTIC_IGNORE_INVALID_OFFSETOF
+	_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
 #else
   /* GCC */
 # define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT \
@@ -279,6 +276,14 @@ void *memmove(T *d, const U *s, size_t n) = delete;
 	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
 # define DIAGNOSTIC_IGNORE_LOGICAL_OP \
 	_Pragma("GCC diagnostic ignored \"-Wlogical-op\"")
+#if __GNUG__ && __GNUC__ >= 7
+# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES				\
+	_Pragma("GCC diagnostic ignored \"-Wduplicated-branches\"")
+#else
+# define DIAGNOSTIC_IGNORE_DUPLICATED_BRANCHES
+#endif /* __GNUG__ && __GNUC__ >= 7 */
+# define DIAGNOSTIC_IGNORE_INVALID_OFFSETOF				\
+	_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
 #endif
 
 /* Used to make specific C++ functions to C code. */
@@ -308,4 +313,18 @@ int lttng_strncpy(char *dst, const char *src, size_t dst_len)
 	return 0;
 }
 
+namespace lttng {
+namespace utils {
+template <class Parent, class Member>
+Parent *container_of(const Member *member, const Member Parent::*ptr_to_member)
+{
+	const Parent *dummy_parent = nullptr;
+	auto *offset_of_member = reinterpret_cast<const char *>(&(dummy_parent->*ptr_to_member));
+	auto address_of_parent = reinterpret_cast<const char *>(member) - offset_of_member;
+
+	return reinterpret_cast<Parent *>(address_of_parent);
+}
+} /* namespace utils */
+} /* namespace lttng */
+
 #endif /* _MACROS_H */