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
Allow to declare a log category and not use it right away; add XBT_LOG_EXTERNAL_DEFAU...
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index
b405a7a
..
5b56a1b
100644
(file)
--- a/
include/xbt/sysdep.h
+++ b/
include/xbt/sysdep.h
@@
-13,17
+13,28
@@
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h> /* va_list */
#include "xbt/misc.h"
#include "xbt/misc.h"
-#include "xbt/
error
.h"
+#include "xbt/
asserts
.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 */
+
+void xbt_abort(void) _XBT_GNUC_NORETURN;
+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)
+ *
* @{
*/
* @{
*/
-#if
def __GNUC__
-/** @brief
l
ike strdup, but xbt_die() on error */
+#if
defined(__GNUC__) || defined(DOXYGEN)
+/** @brief
L
ike strdup, but xbt_die() on error */
static inline char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
static inline char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
@@
-33,7
+44,7
@@
static inline char *xbt_strdup(const char *s) {
}
return res;
}
}
return res;
}
-/** @brief
l
ike malloc, but xbt_die() on error
+/** @brief
L
ike malloc, but xbt_die() on error
@hideinitializer */
static inline void *xbt_malloc(int n){
void *res=malloc(n);
@hideinitializer */
static inline void *xbt_malloc(int n){
void *res=malloc(n);
@@
-91,6
+102,11
@@
static inline void *xbt_realloc(void*p,int s){
/** @} */
/** @} */
-END_DECL()
+/* FIXME: better place? */
+int asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
+int vasprintf (char **ptr, const char *fmt, va_list ap);
+char *bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+
+SG_END_DECL()
#endif /* _XBT_SYSDEP_H */
#endif /* _XBT_SYSDEP_H */