X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ca1291c2f63ca6235f4b4885c48413a900aade4..210da270d0339479db706757d8c836621bb138c9:/include/xbt/asserts.h

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index e02965353c..30d9a34512 100644
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -1,6 +1,6 @@
-/*  xbt/asserts.h -- assertion mecanism                                     */
+/*  xbt/asserts.h -- assertion mechanism                                    */
 
-/* Copyright (c) 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2005-2007, 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -14,44 +14,39 @@
 #include "xbt/ex.h"
 
 SG_BEGIN_DECL()
+XBT_PUBLIC_DATA(int) xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */
 
 /**
  * @addtogroup XBT_error
  * @brief Those are the SimGrid version of the good ol' assert macro.
  *
- * You can pass them a format message and arguments, just as if it where a
- * printf.
+ * You can pass them a format message and arguments, just as if it where a printf.
  * It is converted to a XBT_CRITICAL logging request.
- * Be careful: the boolean expression that you want to test should not have
- * side effects, because assertions are disabled at compile time if NDEBUG
- * is set.
+ * Be careful: the boolean expression that you want to test should not have side effects, because assertions are
+ * disabled at compile time if NDEBUG is set.
  *
  * @{
  */
 #ifdef NDEBUG
 #define xbt_assert(...) ((void)0)
 #else
-     /** @brief The condition which failed will be displayed.
-	 @hideinitializer  */
+   /** @brief The condition which failed will be displayed.
+   @hideinitializer  */
 #define xbt_assert(...) \
   _XBT_IF_ONE_ARG(_xbt_assert_ARG1, _xbt_assert_ARGN, __VA_ARGS__)(__VA_ARGS__)
 #define _xbt_assert_ARG1(cond) \
   _xbt_assert_ARGN(cond, "Assertion %s failed", #cond)
-#define _xbt_assert_ARGN(cond, ...) \
-  do { if (!(cond)) THROWF(0, 0, __VA_ARGS__); } while (0)
+#define _xbt_assert_ARGN(cond, ...)                                                                                    \
+  do {                                                                                                                 \
+    if (!(cond)) {                                                                                                     \
+      XBT_CCRITICAL(root, __VA_ARGS__);                                                                                \
+      if (!xbt_log_no_loc)                                                                                             \
+        xbt_backtrace_display_current();                                                                               \
+      abort();                                                                                                         \
+    }                                                                                                                  \
+  } while (0)
 #endif
 
-#ifdef XBT_USE_DEPRECATED
-
-#define xbt_assert0(...)        xbt_assert(__VA_ARGS__)
-#define xbt_assert1(...)        xbt_assert(__VA_ARGS__)
-#define xbt_assert2(...)        xbt_assert(__VA_ARGS__)
-#define xbt_assert3(...)        xbt_assert(__VA_ARGS__)
-#define xbt_assert4(...)        xbt_assert(__VA_ARGS__)
-#define xbt_assert5(...)        xbt_assert(__VA_ARGS__)
-#define xbt_assert6(...)        xbt_assert(__VA_ARGS__)
-
-#endif
 /** @} */
-    SG_END_DECL()
+SG_END_DECL()
 #endif                          /* _XBT_ASSERTS_H */