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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index
33b10eb
..
0d09d8a
100644
(file)
--- a/
include/xbt/sysdep.h
+++ b/
include/xbt/sysdep.h
@@
-2,7
+2,7
@@
/* no system header should be loaded out of this file so that we have only */
/* one file to check when porting to another OS */
/* no system header should be loaded out of this file so that we have only */
/* one file to check when porting to another OS */
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-17,12
+17,12
@@
#include "simgrid_config.h"
#include "simgrid_config.h"
+SG_BEGIN_DECL()
+
#include <string.h>
#include <stdlib.h>
#include <stdarg.h> /* va_list */
#include <string.h>
#include <stdlib.h>
#include <stdarg.h> /* va_list */
-SG_BEGIN_DECL()
-
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
/**
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
/**
@@
-31,7
+31,7
@@
SG_BEGIN_DECL()
* @{
*/
/** @brief Kill the program in silence */
* @{
*/
/** @brief Kill the program in silence */
-XBT_PUBLIC(void)
xbt_abort(void) _XBT_GNUC_NORETURN
;
+XBT_PUBLIC(void)
XBT_ATTRIB_NORETURN xbt_abort(void)
;
/**
* @brief Kill the program with an error message
/**
* @brief Kill the program with an error message
@@
-50,16
+50,20
@@
XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
} while (0)
/** @} */
} while (0)
/** @} */
+#ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL
+XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
+#else
XBT_LOG_EXTERNAL_CATEGORY(xbt);
XBT_LOG_EXTERNAL_CATEGORY(xbt);
+#endif
/* 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 */
#ifndef __USE_GNU /* do not redeclare existing headers */
XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */
/* 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 */
#ifndef __USE_GNU /* do not redeclare existing headers */
XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */
- ...)
_XBT_GNUC
_PRINTF(2, 3);
+ ...)
XBT_ATTRIB
_PRINTF(2, 3);
XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
#endif
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);
+XBT_PUBLIC(char *) bprintf(const char *fmt, ...)
XBT_ATTRIB
_PRINTF(1, 2);
/** @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)
@@
-67,11
+71,12
@@
XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
* @{
*/
* @{
*/
-#if defined(__GNUC__) || defined(DOXYGEN)
+#if defined(_MSC_VER) && !defined(strdup)
+# define strdup _strdup /* POSIX name is not ANSI complient blabla */
+#endif
+
/** @brief Like strdup, but xbt_die() on error */
/** @brief Like strdup, but xbt_die() on error */
-static inline __attribute__ ((always_inline))
-char *xbt_strdup(const char *s)
-{
+static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
res = strdup(s);
char *res = NULL;
if (s) {
res = strdup(s);
@@
-85,9
+90,7
@@
XBT_PUBLIC(void) xbt_backtrace_display_current(void);
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_malloc(size_t n)
-{
+static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
void *res;
/* if (n==0) {
xbt_backtrace_display_current();
void *res;
/* if (n==0) {
xbt_backtrace_display_current();
@@
-102,9
+105,7
@@
void *xbt_malloc(size_t 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 __attribute__ ((always_inline))
-void *xbt_malloc0(size_t n)
-{
+static XBT_ALWAYS_INLINE void *xbt_malloc0(size_t n) {
void *res;
//if (n==0) xbt_die("calloc(0) is not portable");
res = calloc(n, 1);
void *res;
//if (n==0) xbt_die("calloc(0) is not portable");
res = calloc(n, 1);
@@
-115,9
+116,7
@@
void *xbt_malloc0(size_t n)
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_realloc(void *p, size_t s)
-{
+static XBT_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) {
void *res = NULL;
//if (s==0) xbt_die("realloc(0) is not portable");
if (s) {
@@
-133,24
+132,18
@@
void *xbt_realloc(void *p, size_t 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 */
/** @brief like free
@hideinitializer */
-#define xbt_free
free
/*nothing specific to do here. A poor valgrind replacement? */
+#define xbt_free
(p) free(p)
/*nothing specific to do here. A poor valgrind replacement? */
/** @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 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 */
+SG_END_DECL()
+
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error
@hideinitializer */
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error
@hideinitializer */
@@
-158,6
+151,4
@@
XBT_PUBLIC(void) xbt_free_ref(void *d);
/** @} */
/** @} */
-
-SG_END_DECL()
#endif /* _XBT_SYSDEP_H */
#endif /* _XBT_SYSDEP_H */