X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb90d05d85d2d8871e8f44a9362068158fc4b2fd..a78ea01a79ad9f2b8586a3d481edbd461167631e:/include/xbt/sysdep.h diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 33aefed2a4..536c12d9d1 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -11,15 +11,16 @@ #ifndef _XBT_SYSDEP_H #define _XBT_SYSDEP_H -#include -#include -#include /* va_list */ - +#include "xbt/log.h" #include "xbt/misc.h" #include "xbt/asserts.h" #include "simgrid_config.h" +#include +#include +#include /* va_list */ + SG_BEGIN_DECL() /* They live in asserts.h, but need to be declared before this module. @@ -29,8 +30,35 @@ SG_BEGIN_DECL() * * @{ */ -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 */ +#ifdef COVERAGE +/* Call __gcov_flush on abort when compiling with coverage options. */ +#define xbt_abort() \ + do { \ + extern void __gcov_flush(void); \ + __gcov_flush(); \ + abort(); \ + } while (0) +#else +#define xbt_abort() abort() +#endif + +/** + * @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 @@ -77,8 +105,7 @@ void *xbt_malloc(size_t n) 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; } @@ -91,8 +118,7 @@ void *xbt_malloc0(size_t n) //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; } @@ -107,15 +133,12 @@ void *xbt_realloc(void *p, size_t 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); } } else { - if (p) { - free(p); - } + free(p); } return res; } @@ -129,7 +152,6 @@ void *xbt_realloc(void *p, size_t s) /** @brief like free @hideinitializer */ #define xbt_free free /*nothing specific to do here. A poor valgrind replacement? */ -/*#define xbt_free_fct free * replacement with the guareenty of being a function FIXME:KILLME*/ /** @brief like free, but you can be sure that it is a function */ XBT_PUBLIC(void) xbt_free_f(void *p);