A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce the visibility of stdio.h because it was loaded wrongly (ie, before _GNU_SOURC...
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index
4f65736
..
a2271ab
100644
(file)
--- a/
include/xbt/sysdep.h
+++ b/
include/xbt/sysdep.h
@@
-13,52
+13,69
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h> /* va_list */
#include "xbt/misc.h"
#include "xbt/misc.h"
-#include "xbt/error.h"
+#include "xbt/asserts.h"
+#include "xbt/str.h"
-BEGIN_DECL()
+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;
+/** @} */
+
/** @addtogroup XBT_syscall
/** @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 __inline__ char *xbt_strdup(const char *s) {
+#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)
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;
}
}
return res;
}
-/** @brief
l
ike malloc, but xbt_die() on error
+/** @brief
L
ike malloc, but xbt_die() on error
@hideinitializer */
@hideinitializer */
-static
__inline__
void *xbt_malloc(int n){
+static
XBT_INLINE
void *xbt_malloc(int n){
void *res=malloc(n);
if (!res)
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 */
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)
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 */
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)
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);
}
} else {
res=xbt_malloc(s);
}
@@
-69,11
+86,22
@@
static __inline__ void *xbt_realloc(void*p,int s){
}
return res;
}
}
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
@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
+ @hideinitializer */
+XBT_PUBLIC(void) xbt_free_f(void* p);
+
/** @brief like calloc, but xbt_die() on error and don't memset to 0
@hideinitializer */
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error and don't memset to 0
@hideinitializer */
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
@@
-83,6
+111,7
@@
static __inline__ void *xbt_realloc(void*p,int s){
/** @} */
/** @} */
-END_DECL()
+
+SG_END_DECL()
#endif /* _XBT_SYSDEP_H */
#endif /* _XBT_SYSDEP_H */