git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2856
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
#include "xbt/asserts.h"
SG_BEGIN_DECL()
#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);
+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 */
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
if (s) {
res=strdup(s);
if (!res)
if (s) {
res=strdup(s);
if (!res)
- xbt_die("memory allocation error");
+ xbt_die("memory allocation error (strdup returned NULL)");
static XBT_INLINE void *xbt_malloc(int n){
void *res=malloc(n);
if (!res)
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));
static XBT_INLINE void *xbt_malloc0(int n) {
void *res=calloc(n,1);
if (!res)
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));
if (p) {
res=realloc(p,s);
if (!res)
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);
}
} 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);