X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=74f9096c7cf3b83fded3864bc76d0b0d1e0c5fb0;hb=3299fd310c0fab63e912004cdd404d586f936f9e;hp=e52d7f7712764751d81aea4c69ce39856c7d9994;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index e52d7f771..74f9096c7 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -57,53 +57,23 @@ void *zmalloc(size_t len)
 	})
 #endif
 
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef max_t
-#define max_t(type, a, b)	max((type) a, (type) b)
-#endif
-
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef min_t
-#define min_t(type, a, b)	min((type) a, (type) b)
-#endif
-
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
 
-/*
- * Align value to the next multiple of align. Returns val if it already is a
- * multiple of align. Align must be a power of two.
- */
-#define ALIGN_TO(value, align) ((value + (align - 1)) & ~(align - 1))
-
-/*
- * LTTNG_HIDDEN: set the hidden attribute for internal functions
- * On Windows, symbols are local unless explicitly exported,
- * see https://gcc.gnu.org/wiki/Visibility
- */
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define LTTNG_HIDDEN
+#ifndef LTTNG_NO_SANITIZE_ADDRESS
+#if defined(__clang__) || defined (__GNUC__)
+#define LTTNG_NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))
 #else
-#define LTTNG_HIDDEN __attribute__((visibility("hidden")))
+#define LTTNG_NO_SANITIZE_ADDRESS
+#endif
 #endif
 
+#define is_signed(type) (((type) -1) < (type) 1)
+
 #define member_sizeof(type, field)	sizeof(((type *) 0)->field)
 
-#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
-
-/*
- * 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 }))
+#define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
 
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.
@@ -123,4 +93,15 @@ int lttng_strncpy(char *dst, const char *src, size_t dst_len)
 	return 0;
 }
 
+#ifdef NDEBUG
+/*
+* Force usage of the assertion condition to prevent unused variable warnings
+* when `assert()` are disabled by the `NDEBUG` definition.
+*/
+# define LTTNG_ASSERT(_cond) ((void) sizeof((void) (_cond), 0))
+#else
+# include <assert.h>
+# define LTTNG_ASSERT(_cond) assert(_cond)
+#endif
+
 #endif /* _MACROS_H */