X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8c9eb82be9ebfc8a9ec4ab10f914483a3e04f81..7279a2ea28348341347a9a4dc99d54355726290c:/include/xbt/asserts.h
diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index d0f486405f..58c226d4e5 100644
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -1,7 +1,7 @@
-/* $Id$ */
/* xbt/asserts.h -- assertion mecanism */
-/* Copyright (c) 2004,2005 Martin Quinson. All rights reserved. */
+/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,56 +11,47 @@
#include "xbt/misc.h"
#include "xbt/log.h"
-
+#include "xbt/ex.h"
+
SG_BEGIN_DECL()
/**
* @addtogroup XBT_error
* @brief Those are the SimGrid version of the good ol' assert macro.
*
- *
Top | [\ref index]::[\ref XBT_API]
- * |
Prev | [\ref XBT_log]
- * |
Next | [\ref XBT_config] |
- *
- * You can pass them a format message and arguments, just as if it where a printf.
- * It is converted to a CRITICALn logging request.
+ * 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.
*
* @{
*/
#ifdef NDEBUG
-#define xbt_assert(cond)
-#define xbt_assert0(cond,msg)
-#define xbt_assert1(cond,msg,a)
-#define xbt_assert2(cond,msg,a,b)
-#define xbt_assert3(cond,msg,a,b,c)
-#define xbt_assert4(cond,msg,a,b,c,d)
-#define xbt_assert5(cond,msg,a,b,c,d,e)
-#define xbt_assert6(cond,msg,a,b,c,d,e,f)
+#define xbt_assert(...) ((void)0)
#else
/** @brief The condition which failed will be displayed.
- @hideinitializer */
-#define xbt_assert(cond) if (!(cond)) { CRITICAL1("Assertion %s failed", #cond); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert0(cond,msg) if (!(cond)) { CRITICAL0(msg); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert1(cond,msg,a) if (!(cond)) { CRITICAL1(msg,a); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert2(cond,msg,a,b) if (!(cond)) { CRITICAL2(msg,a,b); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert3(cond,msg,a,b,c) if (!(cond)) { CRITICAL3(msg,a,b,c); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert4(cond,msg,a,b,c,d) if (!(cond)) { CRITICAL4(msg,a,b,c,d); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert5(cond,msg,a,b,c,d,e) if (!(cond)) { CRITICAL5(msg,a,b,c,d,e); xbt_abort(); }
- /** @hideinitializer */
-#define xbt_assert6(cond,msg,a,b,c,d,e,f) if (!(cond)) { CRITICAL6(msg,a,b,c,d,e,f); xbt_abort(); }
+ @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)
#endif
-
-void xbt_abort(void) _XBT_GNUC_NORETURN;
-void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
-/** @} */
-
-SG_END_DECL()
+#ifdef XBT_USE_DEPRECATED
-#endif /* _XBT_ASSERTS_H */
+#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()
+#endif /* _XBT_ASSERTS_H */