X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=3e175735083a9df7d390cdad5cc5fa43a20c4c26;hb=942003e52b8fe43bfb8f28a1884d3bda7e6d1e0b;hp=874501ef1749325b38ba6d4214990da1396cd74a;hpb=1cbd136b2479ef142bfb339b13d3d25aa772dda5;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index 874501ef1..3e1757350 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -57,32 +57,6 @@ void *zmalloc(size_t len)
 	})
 #endif
 
-
-/*
- * The min and max macros are not needed in C++ (std::min and std::max are
- * preferred) and they conflict with some C++ header file. Don't define them
- * when compiling C++ source.
- */
-#ifndef __cplusplus
-
-# ifndef max
-#  define max(a, b) ((a) > (b) ? (a) : (b))
-# endif
-
-# ifndef min
-#  define min(a, b) ((a) < (b) ? (a) : (b))
-# endif
-
-# ifndef max_t
-#  define max_t(type, a, b)	max((type) a, (type) b)
-# endif
-
-# ifndef min_t
-#  define min_t(type, a, b)	min((type) a, (type) b)
-# endif
-
-#endif
-
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
@@ -100,13 +74,43 @@ void *zmalloc(size_t len)
 #define member_sizeof(type, field)	sizeof(((type *) 0)->field)
 
 #define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
+#define ASSERT_RCU_READ_LOCKED(lock) LTTNG_ASSERT(rcu_read_ongoing())
 
-/*
- * Get an aligned pointer to a value. This is meant
- * as a helper to pass an aligned pointer to a member in a packed structure
- * to a function.
- */
-#define ALIGNED_CONST_PTR(value) (((const typeof(value) []) { value }))
+/* Attribute suitable to tag functions as having printf()-like arguments. */
+#define ATTR_FORMAT_PRINTF(_string_index, _first_to_check) \
+	__attribute__((format(printf, _string_index, _first_to_check)))
+
+/* Attribute suitable to tag functions as having strftime()-like arguments. */
+#define ATTR_FORMAT_STRFTIME(_string_index) \
+	__attribute__((format(strftime, _string_index, 0)))
+
+/* Macros used to ignore specific compiler diagnostics. */
+
+#define DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+#define DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+
+#if defined(__clang__)
+  /* Clang */
+# define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT
+# define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
+	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+# define DIAGNOSTIC_IGNORE_LOGICAL_OP
+#else
+  /* GCC */
+# define DIAGNOSTIC_IGNORE_SUGGEST_ATTRIBUTE_FORMAT \
+	_Pragma("GCC diagnostic ignored \"-Wsuggest-attribute=format\"")
+# define DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL \
+	_Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
+# define DIAGNOSTIC_IGNORE_LOGICAL_OP \
+	_Pragma("GCC diagnostic ignored \"-Wlogical-op\"")
+#endif
+
+/* Used to make specific C++ functions to C code. */
+#ifdef __cplusplus
+#define C_LINKAGE extern "C"
+#else
+#define C_LINKAGE
+#endif
 
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.