Do not throw an exception on assert, but display backtrace+abort

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index c078b47..e268b0d 100644 (file)
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -14,6 +14,8 @@
 #include "xbt/ex.h"
 
 SG_BEGIN_DECL()
 #include "xbt/ex.h"
 
 SG_BEGIN_DECL()

+extern 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.
 /**
  * @addtogroup XBT_error
  * @brief Those are the SimGrid version of the good ol' assert macro.


@@ -34,8 +36,15 @@ SG_BEGIN_DECL()
   _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)
   _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
 
 /** @} */
 #endif
 
 /** @} */

diff --git a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
index ee4e0a6..8a77381 100644 (file)
--- a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
+++ b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
@@ -1,4 +1,4 @@
 ! expect signal SIGABRT
 ! expect signal SIGABRT

-$ ${bindir:=.}/flatifier ../platforms/bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
+$ ${bindir:=.}/flatifier ../platforms/bogus_two_hosts_asymetric.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --log=no_loc

 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.

-> [  0.000000] [0:maestro@] Error while loading ../platforms/bogus_two_hosts_asymetric.xml: The route between alice and bob already exists (Rq: routes are symmetrical by default).
+> [  0.000000] [0:maestro@] The route between alice and bob already exists (Rq: routes are symmetrical by default).