Fix BUG_ON handling

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/align.h b/include/lttng/align.h
index 0a5363ea3e7161897465b469c52617f32dd2adc7..283926826d2c520999fecf57bf1bd43a6c2305c1 100644 (file)
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -36,7 +36,7 @@
  */
 #define offset_align(align_drift, alignment)                                  \
        ({                                                                     \
-               BUILD_RUNTIME_BUG_ON((alignment) == 0                          \
+               LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0                    \
                                   || ((alignment) & ((alignment) - 1)));      \
                (((alignment) - (align_drift)) & ((alignment) - 1));           \
        })
@@ -51,7 +51,7 @@
  */
 #define offset_align_floor(align_drift, alignment)                            \
        ({                                                                     \
-               BUILD_RUNTIME_BUG_ON((alignment) == 0                          \
+               LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0                    \
                                   || ((alignment) & ((alignment) - 1)));      \
                (((align_drift) - (alignment)) & ((alignment) - 1);            \
        })

diff --git a/include/lttng/bug.h b/include/lttng/bug.h
index ebae9b7436bb6b351b9f1b35c5e0ac571788b7cc..d0e59800ff0020ede9116400c1350f8d9797dc88 100644 (file)
--- a/include/lttng/bug.h
+++ b/include/lttng/bug.h
@@ -2,7 +2,7 @@
 #define _LTTNG_BUG_H
 
 /*
- * lib/bug.h
+ * lttng/bug.h
  *
  * (C) Copyright 2010-2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -14,14 +14,27 @@
  * Permission to modify the code and to distribute modified code is granted,
  * provided the above notices are retained, and a notice that the code was
  * modified is included with the above copyright notice.
- *
  */
 
-#define BUILD_BUG_ON(condition)                                        \
+#include <urcu/compiler.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define LTTNG_BUG_ON(condition)                                                \
+       do {                                                            \
+               if (caa_unlikely(condition)) {                          \
+                       fprintf(stderr,                                 \
+                               "LTTng BUG in file %s, line %d.\n",     \
+                               __FILE__, __LINE__);                    \
+                       exit(EXIT_FAILURE);                             \
+               }                                                       \
+       } while (0)
+
+#define LTTNG_BUILD_BUG_ON(condition)                                  \
        ((void) sizeof(char[-!!(condition)]))
 
 /**
- * BUILD_RUNTIME_BUG_ON - check condition at build (if constant) or runtime
+ * LTTNG_BUILD_RUNTIME_BUG_ON - check condition at build (if constant) or runtime
  * @condition: the condition which should be false.
  *
  * If the condition is a constant and true, the compiler will generate a build
@@ -29,12 +42,12 @@
  * if the condition is ever true. If the condition is constant and false, no
  * code is emitted.
  */
-#define BUILD_RUNTIME_BUG_ON(condition)                                \
+#define LTTNG_BUILD_RUNTIME_BUG_ON(condition)                  \
        do {                                                    \
                if (__builtin_constant_p(condition))            \
-                       BUILD_BUG_ON(condition);                \
+                       LTTNG_BUILD_BUG_ON(condition);          \
                else                                            \
-                       BUG_ON(condition);                      \
+                       LTTNG_BUG_ON(condition);                \
        } while (0)
 
 #endif