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
added circle placement for ns3 wifi nodes
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index 7bcc04b7381e2c707666a058a64c9222ce7ca734..1480cf92db98c9ec70fb258f353826afedb2ccc3 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-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
20
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-20,7
+20,7
@@
#include <stdlib.h>
#include <stdarg.h> /* va_list */
#include <stdlib.h>
#include <stdarg.h> /* va_list */
-SG_BEGIN_DECL
()
+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 */
@@
-34,7
+34,7
@@
XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_abort(void);
/**
* @brief Kill the program with an error message
/**
* @brief Kill the program with an error message
- *
\
param ... a format string and its arguments
+ *
@
param ... a format string and its arguments
*
* Things are so messed up that the only thing to do now, is to stop the program.
*
*
* Things are so messed up that the only thing to do now, is to stop the program.
*
@@
-49,12
+49,14
@@
XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_abort(void);
#ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL
XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
#ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL
XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
+XBT_LOG_NEW_SUBCATEGORY(xbt_help, xbt, "Help messages");
#else
XBT_LOG_EXTERNAL_CATEGORY(xbt);
#else
XBT_LOG_EXTERNAL_CATEGORY(xbt);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_help);
#endif
/** @addtogroup XBT_syscall
#endif
/** @addtogroup XBT_syscall
- * @brief Malloc and associated functions, killing the program on error (with
\
ref XBT_ex)
+ * @brief Malloc and associated functions, killing the program on error (with
@
ref XBT_ex)
*
* @{
*/
*
* @{
*/
@@
-70,8
+72,6
@@
static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
return res;
}
return res;
}
-XBT_PUBLIC void xbt_backtrace_display_current();
-
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
@@
-112,12
+112,18
@@
static XBT_ALWAYS_INLINE void *xbt_realloc(void *p, size_t s) {
@hideinitializer */
#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
@hideinitializer */
#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
+#ifdef __cplusplus
+#define XBT_FREE_NOEXCEPT noexcept(noexcept(::free))
+#else
+#define XBT_FREE_NOEXCEPT
+#endif
+
/** @brief like free, but you can be sure that it is a function */
/** @brief like free, but you can be sure that it is a function */
-XBT_PUBLIC void xbt_free_f(void* p);
+XBT_PUBLIC void xbt_free_f(void* p)
XBT_FREE_NOEXCEPT
;
/** @brief should be given a pointer to pointer, and frees the second one */
/** @brief should be given a pointer to pointer, and frees the second one */
-XBT_PUBLIC void xbt_free_ref(void* d);
+XBT_PUBLIC void xbt_free_ref(void* d)
XBT_FREE_NOEXCEPT
;
-SG_END_DECL
()
+SG_END_DECL
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error