#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 ... a format string and its arguments
+ *
+ * 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
res = malloc(n);
if (!res)
- xbt_die(bprintf("Memory allocation of %lu bytes failed",
- (unsigned long)n));
+ xbt_die("Memory allocation of %lu bytes failed", (unsigned long)n);
return res;
}
//if (n==0) xbt_die("calloc(0) is not portable");
res = calloc(n, 1);
if (!res)
- xbt_die(bprintf("Memory callocation of %lu bytes failed",
- (unsigned long)n));
+ xbt_die("Memory callocation of %lu bytes failed", (unsigned long)n);
return res;
}
static inline __attribute__ ((always_inline))
void *xbt_realloc(void *p, size_t s)
{
- void *res = res;
+ void *res = NULL;
//if (s==0) xbt_die("realloc(0) is not portable");
if (s) {
if (p) {
res = realloc(p, s);
if (!res)
- xbt_die(bprintf("memory (re)allocation of %lu bytes failed",
- (unsigned long)s));
+ xbt_die("memory (re)allocation of %lu bytes failed", (unsigned long)s);
} else {
res = xbt_malloc(s);
}