-void* gras_malloc (long int bytes);
-void* gras_malloc0 (long int bytes);
-void* gras_realloc (void *memory, long int bytes);
-void gras_free (void *memory);
-
-#define gras_new(type, count) ((type*)gras_malloc (sizeof (type) * (count)))
-#define gras_new0(type, count) ((type*)gras_malloc0 (sizeof (type) * (count)))
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define _GRAS_GNUC_PRINTF( format_idx, arg_idx ) \
- __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#define _GRAS_GNUC_SCANF( format_idx, arg_idx ) \
- __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
-#define _GRAS_GNUC_FORMAT( arg_idx ) \
- __attribute__((__format_arg__ (arg_idx)))
-#define _GRAS_GNUC_NORETURN \
- __attribute__((__noreturn__))
-#else /* !__GNUC__ */
-#define _GRAS_GNUC_PRINTF( format_idx, arg_idx )
-#define _GRAS_GNUC_SCANF( format_idx, arg_idx )
-#define _GRAS_GNUC_FORMAT( arg_idx )
-#define _GRAS_GNUC_NORETURN
-#endif /* !__GNUC__ */
-
-void gras_abort(void) _GRAS_GNUC_NORETURN;
-
-/* FIXME: This is a very good candidate to rewrite (along with a proper string stuff)
- but I'm too lazy right now, so copy the definition */
-long int strtol(const char *nptr, char **endptr, int base);
-double strtod(const char *nptr, char **endptr);
-int atoi(const char *nptr);
-
-
-
-#ifdef __cplusplus
+/** @addtogroup XBT_syscall
+ * @brief Malloc and associated functions, killing the program on error (with @ref XBT_ex)
+ *
+ * @{
+ */
+
+/** @brief Like strdup, but xbt_die() on error */
+static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
+ char *res = NULL;
+ if (s) {
+ res = strdup(s);
+ xbt_assert(res, "memory allocation error (strdup returned NULL)");
+ }
+ return res;
+}
+
+/** @brief Like malloc, but xbt_die() on error
+ @hideinitializer */
+static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
+ void* res = malloc(n);
+ xbt_assert(res, "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 XBT_ALWAYS_INLINE void *xbt_malloc0(size_t n) {
+ void* res = calloc(n, 1);
+ xbt_assert(res, "Memory callocation of %lu bytes failed", (unsigned long)n);
+ return res;
+}
+
+/** @brief like realloc, but xbt_die() on error
+ @hideinitializer */
+static XBT_ALWAYS_INLINE void *xbt_realloc(void *p, size_t s) {
+ void *res = NULL;
+ if (s) {
+ if (p) {
+ res = realloc(p, s);
+ xbt_assert(res, "memory (re)allocation of %lu bytes failed", (unsigned long)s);
+ } else {
+ res = xbt_malloc(s);
+ }
+ } else {
+ free(p);
+ }
+ return res;