summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-13 03:59:39 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-13 03:59:39 +0200
commitdd8f71ee9fe4408311b335726e0787a37fbf9d42 (patch)
treed4c5e95d416e25faf0b7f1afbbdff433564523a0
parent40531a555ae313543c0fbb80137edbae71eee773 (diff)
macro: hookup assert logic with log logic
-rw-r--r--macro.h30
1 files changed, 26 insertions, 4 deletions
diff --git a/macro.h b/macro.h
index 2eaa3d6fbb..d56585dc34 100644
--- a/macro.h
+++ b/macro.h
@@ -35,6 +35,8 @@
#define _deprecated __attribute__ ((deprecated))
#define _packed __attribute__ ((packed))
#define _malloc __attribute__ ((malloc))
+#define _likely(x) (__builtin_expect(!!(x),1))
+#define _unlikely(x) (__builtin_expect(!!(x),0))
/* Rounds up */
static inline size_t ALIGN(size_t l) {
@@ -65,11 +67,29 @@ static inline size_t ALIGN(size_t l) {
((_x > _high) ? _high : ((_x < _low) ? _low : _x)); \
})
+#define assert_se(expr) \
+ do { \
+ if (_unlikely(!(expr))) { \
+ log_error("Assertion '%s' failed at %s:%u, function %s(). Aborting.", \
+ #expr , __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ abort(); \
+ } \
+ } while (false) \
+
+/* We override the glibc assert() here. */
+#undef assert
+#ifdef NDEBUG
+#define assert(expr) do {} while(false)
+#else
+#define assert(expr) assert_se(expr)
+#endif
-
-#define assert_not_reached(t) assert(!(t))
-
-#define assert_se(x) assert(x)
+#define assert_not_reached(t) \
+ do { \
+ log_error("Code should not be reached '%s' at %s:%u, function %s(). Aborting.", \
+ t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+ abort(); \
+ } while (false)
#define assert_cc(expr) \
do { \
@@ -103,4 +123,6 @@ static inline size_t ALIGN(size_t l) {
(iovec).iov_len = strlen(s); \
} while(false);
+#include "log.h"
+
#endif