Define and use utility class to compare pairs in priority queues.

[simgrid.git] / include / xbt / asserts.h

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index c078b47..b3494cf 100644 (file)
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -6,14 +6,16 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_ASSERTS_H
-#define _XBT_ASSERTS_H
+#ifndef XBT_ASSERTS_H
+#define XBT_ASSERTS_H
 
 #include "xbt/misc.h"
 #include "xbt/log.h"
 #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.
@@ -34,10 +36,17 @@ 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
 
 /** @} */
 SG_END_DECL()
-#endif                          /* _XBT_ASSERTS_H */
+#endif                          /* XBT_ASSERTS_H */