X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/215ed67257173f5e26c9489ec96c4ced08d1614a..61eea4d2a96e8804b2d0cecc2ef5bece461255d6:/include/xbt/sysdep.h
diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 7d41431806..752ca7ea15 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -21,53 +21,62 @@
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 */
+
+XBT_PUBLIC void xbt_abort(void) _XBT_GNUC_NORETURN;
+XBT_PUBLIC void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
+
+
/** @addtogroup XBT_syscall
* @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
*
- *
Top | [\ref index]::[\ref XBT_API]
- * |
Prev |
- * |
Next | [\ref XBT_ex] |
* @{
*/
#if defined(__GNUC__) || defined(DOXYGEN)
/** @brief Like strdup, but xbt_die() on error */
-static 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 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 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 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);
}
@@ -99,9 +108,6 @@ static inline void *xbt_realloc(void*p,int s){
/** @} */
-/* FIXME: better place? */
-int vasprintf (char **ptr, const char *fmt, va_list ap);
-char *bprintf(const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
SG_END_DECL()