-#define xbt_strdup(s) ((s)?(strdup(s)?:(xbt_die("memory allocation error"),NULL))\
- :(NULL))
-#define xbt_malloc(n) (malloc(n) ?: (xbt_die("memory allocation error"),NULL))
-#define xbt_malloc0(n) (calloc( (n),1 ) ?: (xbt_die("memory allocation error"),NULL))
-#define xbt_realloc(p,s) (s? (p? (realloc(p,s)?:(xbt_die("memory allocation error"),NULL)) \
- : xbt_malloc(s)) \
- : (p? (free(p),NULL) \
- : NULL))
+SG_BEGIN_DECL()
+/* 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;
+
+
+/** @addtogroup XBT_syscall
+ * @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
+ *
+ * @{
+ */
+
+#if defined(__GNUC__) || defined(DOXYGEN)
+/** @brief Like strdup, but xbt_die() on error */
+static XBT_INLINE char *xbt_strdup(const char *s) {
+ char *res = NULL;
+ if (s) {
+ res=strdup(s);
+ if (!res)
+ xbt_die("memory allocation error");
+ }
+ return res;
+}
+/** @brief Like malloc, but xbt_die() on error
+ @hideinitializer */
+static XBT_INLINE void *xbt_malloc(int n){
+ void *res=malloc(n);
+ if (!res)
+ xbt_die("Memory allocation failed");
+ return res;
+}
+
+/** @brief like malloc, but xbt_die() on error and memset data to 0
+ @hideinitializer */
+static XBT_INLINE void *xbt_malloc0(int n) {
+ void *res=calloc(n,1);
+ if (!res)
+ xbt_die("Memory callocation failed");
+ return res;
+}
+
+/** @brief like realloc, but xbt_die() on error
+ @hideinitializer */
+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");
+ } else {
+ res=xbt_malloc(s);
+ }
+ } else {
+ if (p) {
+ free(p);
+ }
+ }
+ return res;
+}
+#else /* non __GNUC__ */
+# define xbt_strdup(s) strdup(s)
+# define xbt_malloc(n) malloc(n)
+# define xbt_malloc0(n) calloc(n,1)
+# define xbt_realloc(p,s) realloc(p,s)
+#endif /* __GNUC__ ? */
+
+/** @brief like free
+ @hideinitializer */