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
cosmetics
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index
2fcad47
..
e75b40f
100644
(file)
--- a/
include/xbt/sysdep.h
+++ b/
include/xbt/sysdep.h
@@
-20,19
+20,22
@@
#include "xbt/asserts.h"
SG_BEGIN_DECL()
#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 */
+
+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)
*
/** @addtogroup XBT_syscall
* @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
*
- * <center><table><tr><td><b>Top</b> <td> [\ref index]::[\ref XBT_API]
- * <tr><td>Prev <td>
- * <tr><td><b>Next</b> <td> [\ref XBT_ex] </table></center>
* @{
*/
#if defined(__GNUC__) || defined(DOXYGEN)
/** @brief Like strdup, but xbt_die() on error */
* @{
*/
#if defined(__GNUC__) || defined(DOXYGEN)
/** @brief Like strdup, but xbt_die() on error */
-static
inline
char *xbt_strdup(const char *s) {
+static
XBT_INLINE
char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
res=strdup(s);
char *res = NULL;
if (s) {
res=strdup(s);
@@
-43,7
+46,7
@@
static inline char *xbt_strdup(const char *s) {
}
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
}
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static
inline
void *xbt_malloc(int n){
+static
XBT_INLINE
void *xbt_malloc(int n){
void *res=malloc(n);
if (!res)
xbt_die("Memory allocation failed");
void *res=malloc(n);
if (!res)
xbt_die("Memory allocation failed");
@@
-52,7
+55,7
@@
static inline void *xbt_malloc(int n){
/** @brief like malloc, but xbt_die() on error and memset data to 0
@hideinitializer */
/** @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)
xbt_die("Memory callocation failed");
void *res=calloc(n,1);
if (!res)
xbt_die("Memory callocation failed");
@@
-61,7
+64,7
@@
static inline void *xbt_malloc0(int n) {
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
/** @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) {
void *res=res;
if (s) {
if (p) {