macro: hookup assert logic with log logic

[elogind.git] / macro.h

diff --git a/macro.h b/macro.h
index 0223a40b6e71824e928ece08151c5a5636e5ce53..d56585dc341bdfc93480c8a92ec8f4a55138bade 100644 (file)
--- a/macro.h
+++ b/macro.h
@@ -3,19 +3,40 @@
 #ifndef foomacrohfoo
 #define foomacrohfoo
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <assert.h>
 #include <sys/types.h>
 
-#define __printf_attr(a,b) __attribute__ ((format (printf, a, b)))
-#define __sentinel __attribute__ ((sentinel))
-#define __noreturn __attribute__((noreturn))
-#define __unused __attribute__ ((unused))
-#define __destructor __attribute__ ((destructor))
-#define __pure __attribute__ ((pure))
-#define __const __attribute__ ((const))
-#define __deprecated __attribute__ ((deprecated))
-#define __packed __attribute__ ((packed))
-#define __malloc __attribute__ ((malloc))
+#define _printf_attr(a,b) __attribute__ ((format (printf, a, b)))
+#define _sentinel __attribute__ ((sentinel))
+#define _noreturn __attribute__((noreturn))
+#define _unused __attribute__ ((unused))
+#define _destructor __attribute__ ((destructor))
+#define _pure __attribute__ ((pure))
+#define _const __attribute__ ((const))
+#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) {
@@ -46,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 {                                       \
@@ -78,4 +117,12 @@ static inline size_t ALIGN(size_t l) {
 
 #define char_array_0(x) x[sizeof(x)-1] = 0;
 
+#define IOVEC_SET_STRING(iovec, s)              \
+        do {                                    \
+                (iovec).iov_base = s;           \
+                (iovec).iov_len = strlen(s);    \
+        } while(false);
+
+#include "log.h"
+
 #endif