Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / common / macros.h

diff --git a/src/common/macros.h b/src/common/macros.h
index e28250f7ed20a7892600c161f6b0921ff10424d3..2b16e5b68a42fe073b22904f8f645b465efd046a 100644 (file)
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -85,7 +85,7 @@ void *zmalloc(size_t len)
 #endif
 #endif
 
-#define is_signed(type) (((type) (-1)) < 0)
+#define is_signed(type) (((type) -1) < (type) 1)
 
 /*
  * Align value to the next multiple of align. Returns val if it already is a
@@ -106,7 +106,7 @@ void *zmalloc(size_t len)
 
 #define member_sizeof(type, field)     sizeof(((type *) 0)->field)
 
-#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
+#define ASSERT_LOCKED(lock) LTTNG_ASSERT(pthread_mutex_trylock(&lock))
 
 /*
  * Get an aligned pointer to a value. This is meant
@@ -133,4 +133,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 */