#define _XBT_SYSDEP_H
#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h> /* va_list */
-
+#include <stdlib.h>
+#include <stdarg.h> /* va_list */
+
#include "xbt/misc.h"
#include "xbt/asserts.h"
-
+
SG_BEGIN_DECL()
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
/**
* @addtogroup XBT_error
- *
+ *
* @{
*/
XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
XBT_PUBLIC(void) xbt_die(const char *msg) _XBT_GNUC_NORETURN;
/** @} */
-/* these ones live in str.h, but redeclare them here so that we do
+/* these ones live in str.h, but redeclare them here so that we do
not need to load the whole str.h and its heavy dependencies */
-XBT_PUBLIC(int) asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
-XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap);
-XBT_PUBLIC(char*) bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+#ifndef __USE_GNU /* do not redeclare existing headers */
+XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */
+ ...) _XBT_GNUC_PRINTF(2, 3);
+XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
+#endif
+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 XBT_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)
+ res = strdup(s);
+ if (!res)
xbt_die("memory allocation error (strdup returned NULL)");
- }
+ }
return res;
}
-/** @brief Like malloc, but xbt_die() on error
+
+XBT_PUBLIC(void) xbt_backtrace_display_current(void);
+
+/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static XBT_INLINE void *xbt_malloc(int n){
- void *res=malloc(n);
+static XBT_INLINE void *xbt_malloc(unsigned int 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 %d bytes failed",n));
+ 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 XBT_INLINE void *xbt_malloc0(int n) {
- void *res=calloc(n,1);
+static XBT_INLINE void *xbt_malloc0(unsigned int 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 %d bytes failed",n));
+ xbt_die(bprintf("Memory callocation of %d bytes failed", n));
return res;
}
-
-/** @brief like realloc, but xbt_die() on error
+
+/** @brief like realloc, but xbt_die() on error
@hideinitializer */
-static XBT_INLINE void *xbt_realloc(void*p,int s){
- void *res=res;
+static XBT_INLINE void *xbt_realloc(void *p, unsigned int s)
+{
+ void *res = res;
+ //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 %d bytes failed",s));
+ res = realloc(p, s);
+ if (!res)
+ xbt_die(bprintf("memory (re)allocation of %d bytes failed", s));
} else {
- res=xbt_malloc(s);
+ res = xbt_malloc(s);
}
} else {
if (p) {
/** @brief like free
@hideinitializer */
-#define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/
+#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
- @hideinitializer */
-XBT_PUBLIC(void) xbt_free_f(void* p);
+/** @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 */
@hideinitializer */
#define xbt_new0(type, count) ((type*)xbt_malloc0 (sizeof (type) * (count)))
-/** @} */
+/** @} */
-
-SG_END_DECL()
+SG_END_DECL()
#endif /* _XBT_SYSDEP_H */