#include "xbt/asserts.h"
SG_BEGIN_DECL()
+
+/* FIXME: better place? */
+int asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
+int vasprintf (char **ptr, const char *fmt, va_list ap);
+XBT_PUBLIC char *bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
-void xbt_abort(void) _XBT_GNUC_NORETURN;
-void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
+XBT_PUBLIC void xbt_abort(void) _XBT_GNUC_NORETURN;
+XBT_PUBLIC void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
/** @addtogroup XBT_syscall
#if defined(__GNUC__) || defined(DOXYGEN)
/** @brief Like strdup, but xbt_die() on error */
-static _XBT_INLINE char *xbt_strdup(const char *s) {
+static XBT_INLINE char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
res=strdup(s);
if (!res)
- xbt_die("memory allocation error");
+ xbt_die("memory allocation error (strdup returned NULL)");
}
return res;
}
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static _XBT_INLINE void *xbt_malloc(int n){
+static XBT_INLINE void *xbt_malloc(int n){
void *res=malloc(n);
if (!res)
- xbt_die("Memory allocation failed");
+ xbt_die(bprintf("Memory allocation of %d bytes failed",n));
return res;
}
/** @brief like malloc, but xbt_die() on error and memset data to 0
@hideinitializer */
-static _XBT_INLINE void *xbt_malloc0(int n) {
+static XBT_INLINE void *xbt_malloc0(int n) {
void *res=calloc(n,1);
if (!res)
- xbt_die("Memory callocation failed");
+ xbt_die(bprintf("Memory callocation of %d bytes failed",n));
return res;
}
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
-static _XBT_INLINE void *xbt_realloc(void*p,int s){
+static XBT_INLINE void *xbt_realloc(void*p,int s){
void *res=res;
if (s) {
if (p) {
res=realloc(p,s);
if (!res)
- xbt_die("memory allocation error");
+ xbt_die(bprintf("memory (re)allocation of %d bytes failed",s));
} else {
res=xbt_malloc(s);
}
/** @} */
-/* FIXME: better place? */
-int asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
-int vasprintf (char **ptr, const char *fmt, va_list ap);
-char *bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
SG_END_DECL()