-
-#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))
-#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 */
-
+XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
+
+/** @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 inline __attribute__ ((always_inline))
+char *xbt_strdup(const char *s)
+{
+ char *res = NULL;
+ if (s) {
+ res = strdup(s);
+ if (!res)
+ xbt_die("memory allocation error (strdup returned NULL)");
+ }
+ return res;
+}
+
+XBT_PUBLIC(void) xbt_backtrace_display_current(void);
+
+/** @brief Like malloc, but xbt_die() on error
+ @hideinitializer */
+static inline __attribute__ ((always_inline))
+void *xbt_malloc(size_t n)
+{
+ void *res;
+/* if (n==0) {
+ xbt_backtrace_display_current();
+ xbt_die("malloc(0) is not portable");
+ }*/
+
+ res = malloc(n);
+ if (!res)
+ xbt_die(bprintf("Memory allocation of %lu bytes failed",
+ (unsigned long)n));
+ return res;
+}
+
+/** @brief like malloc, but xbt_die() on error and memset data to 0
+ @hideinitializer */
+static inline __attribute__ ((always_inline))
+void *xbt_malloc0(size_t n)
+{
+ void *res;
+ //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));
+ return res;
+}
+
+/** @brief like realloc, but xbt_die() on error
+ @hideinitializer */
+static inline __attribute__ ((always_inline))
+void *xbt_realloc(void *p, size_t s)
+{
+ void *res = NULL;
+ //if (s==0) xbt_die("realloc(0) is not portable");
+ if (s) {
+ if (p) {
+ res = realloc(p, s);
+ if (!res)
+ xbt_die(bprintf("memory (re)allocation of %lu bytes failed",
+ (unsigned long)s));
+ } 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 */
+#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);
+/** @brief should be given a pointer to pointer, and frees the second one */
+XBT_PUBLIC(void) xbt_free_ref(void *d);
+
+/** @brief like calloc, but xbt_die() on error and don't memset to 0
+ @hideinitializer */