http://lists.gforge.inria.fr/pipermail/simgrid-user/2010-December/002206.html
* Add new logging macros, with variable number of arguments. Define
XBT_USE_DEPRECATED if you want to use the old macros INFO1, INFO2, etc.
+ * Change xbt_die() to accept a format string with arguments, just like printf.
INSTR
* New configuration options
#include <stdlib.h>
#include <stdarg.h> /* va_list */
+#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/asserts.h"
*
* @{
*/
-XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
-XBT_PUBLIC(void) xbt_die(const char *msg) _XBT_GNUC_NORETURN;
+/** @brief Kill the program in silence */
+#define xbt_abort() abort()
+
+/**
+ * @brief Kill the program with an error message
+ * \param msg
+ *
+ * Things are so messed up that the only thing to do now, is to stop the
+ * program.
+ *
+ * The message is handled by a CRITICAL logging request, and may consist of a
+ * format string with arguments.
+ */
+#define xbt_die(...) \
+ do { \
+ XBT_LOG_EXTERNAL_CATEGORY(xbt); \
+ XBT_CCRITICAL(xbt, __VA_ARGS__); \
+ xbt_abort(); \
+ } while (0)
/** @} */
/* these ones live in str.h, but redeclare them here so that we do
+++ /dev/null
-/* xbt/asserts.h -- assertion mechanism */
-
-/* Copyright (c) 2005, 2008, 2009, 2010. 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. */
-
-#include <stdlib.h> /* abort */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-
-XBT_LOG_EXTERNAL_CATEGORY(xbt);
-XBT_LOG_DEFAULT_CATEGORY(xbt);
-
-/**
- * @brief Kill the program with an error message
- * \param msg
- *
- * Things are so messed up that the only thing to do now, is to stop the program.
- *
- * The message is handled by a CRITICAL logging request
- *
- * If you want to pass arguments to the format, you can always write xbt_assert1(0,"fmt",args) or
- * xbt_die(bprintf("fmt", arg))
- */
-void xbt_die(const char *msg)
-{
- XBT_CRITICAL("%s", msg);
- xbt_abort();
-}
-
-/** @brief Kill the program in silence */
-void xbt_abort(void)
-{
- abort();
-}