From e2754a74fa2b2bc1b32b2304ee845dd684af497e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 21 Oct 2016 23:08:19 +0200 Subject: [PATCH] Do not throw an exception on assert, but display backtrace+abort --- include/xbt/asserts.h | 13 +++++++++++-- .../simdag/flatifier/bogus_two_hosts_asymetric.tesh | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h index c078b475fe..e268b0d619 100644 --- a/include/xbt/asserts.h +++ b/include/xbt/asserts.h @@ -14,6 +14,8 @@ #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. @@ -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) -#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 /** @} */ diff --git a/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh b/teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh index ee4e0a629c..8a77381fa3 100644 --- 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 -$ ${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@] 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). -- 2.20.1