X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66b73d0944f57b9ffe3cf47ebf16f51f969f793f..7a0c355466d01a81f953e8529a8d76751a2964ac:/include/xbt/sysdep.h diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index f464edd0a9..63a4bbce11 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -2,26 +2,25 @@ /* 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-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ -#ifndef _XBT_SYSDEP_H -#define _XBT_SYSDEP_H +#ifndef XBT_SYSDEP_H +#define XBT_SYSDEP_H -#include "xbt/log.h" -#include "xbt/misc.h" -#include "xbt/asserts.h" +#include +#include +#include -#include "simgrid_config.h" +#include #include #include #include /* 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 */ @@ -31,74 +30,52 @@ SG_BEGIN_DECL() * @{ */ /** @brief Kill the program in silence */ -XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN; +XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_abort(void); /** * @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. * - * The message is handled by a CRITICAL logging request, and may consist of a - * format string with arguments. + * The message is handled by a CRITICAL logging request, and may consist of a format string with arguments. */ -#define xbt_die(...) \ - do { \ - XBT_CCRITICAL(xbt, __VA_ARGS__); \ - xbt_abort(); \ +#define xbt_die(...) \ + do { \ + XBT_CCRITICAL(root, __VA_ARGS__); \ + xbt_abort(); \ } while (0) /** @} */ +#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); - -/* 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_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap); +XBT_LOG_EXTERNAL_CATEGORY(xbt_help); #endif -XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2); /** @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) * * @{ */ -#if defined(__GNUC__) || defined(DOXYGEN) /** @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) { -# if !defined(_XBT_WIN32) res = strdup(s); -# else - res = _strdup(s); -# endif if (!res) xbt_die("memory allocation error (strdup returned NULL)"); } return res; } -XBT_PUBLIC(void) xbt_backtrace_display_current(void); - /** @brief Like malloc, but xbt_die() on error @hideinitializer */ -static inline __attribute__ ((always_inline)) -void *xbt_malloc(size_t n) -{ - void *res; -/* if (n==0) { - xbt_backtrace_display_current(); - xbt_die("malloc(0) is not portable"); - }*/ - - res = malloc(n); +static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) { + void* res = malloc(n); if (!res) xbt_die("Memory allocation of %lu bytes failed", (unsigned long)n); return res; @@ -106,12 +83,8 @@ void *xbt_malloc(size_t n) /** @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) -{ - void *res; - //if (n==0) xbt_die("calloc(0) is not portable"); - res = calloc(n, 1); +static XBT_ALWAYS_INLINE void *xbt_malloc0(size_t n) { + void* res = calloc(n, 1); if (!res) xbt_die("Memory callocation of %lu bytes failed", (unsigned long)n); return res; @@ -119,11 +92,8 @@ void *xbt_malloc0(size_t n) /** @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) { if (p) { res = realloc(p, s); @@ -137,28 +107,24 @@ void *xbt_realloc(void *p, size_t s) } return res; } -#else /* non __GNUC__ */ -# if !defined(_XBT_WIN32) -# define xbt_strdup(s) strdup(s) -# else -# define xbt_strdup(s) _strdup(s) -# endif -# 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(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 */ -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 */ -XBT_PUBLIC(void) xbt_free_ref(void *d); +XBT_PUBLIC void xbt_free_ref(void* d) XBT_FREE_NOEXCEPT; + +SG_END_DECL -/** @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 @hideinitializer */ @@ -166,6 +132,4 @@ XBT_PUBLIC(void) xbt_free_ref(void *d); /** @} */ - -SG_END_DECL() -#endif /* _XBT_SYSDEP_H */ +#endif /* XBT_SYSDEP_H */