X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..644e03551ec0faa50ea4b48e5b875b8ac891fbd9:/include/xbt/sysdep.h diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 390ef24a7d..4e407abb99 100644 --- 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 */ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,18 +11,22 @@ #ifndef _XBT_SYSDEP_H #define _XBT_SYSDEP_H +#ifdef __cplusplus +#include +#endif + #include "xbt/log.h" #include "xbt/misc.h" #include "xbt/asserts.h" #include "simgrid_config.h" +SG_BEGIN_DECL() + #include #include #include /* va_list */ -SG_BEGIN_DECL() - /* They live in asserts.h, but need to be declared before this module. double declaration to cut dependency cycle */ /** @@ -31,17 +35,7 @@ SG_BEGIN_DECL() * @{ */ /** @brief Kill the program in silence */ -#ifdef COVERAGE -/* Call __gcov_flush on abort when compiling with coverage options. */ -#define xbt_abort() \ - do { \ - extern void __gcov_flush(void); \ - __gcov_flush(); \ - abort(); \ - } while (0) -#else -#define xbt_abort() abort() -#endif +XBT_PUBLIC(void) XBT_ATTRIB_NORETURN xbt_abort(void); /** * @brief Kill the program with an error message @@ -55,20 +49,25 @@ SG_BEGIN_DECL() */ #define xbt_die(...) \ do { \ - XBT_LOG_EXTERNAL_CATEGORY(xbt); \ XBT_CCRITICAL(xbt, __VA_ARGS__); \ xbt_abort(); \ } 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); +#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 */ - ...) _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(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) @@ -76,11 +75,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 */ -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); @@ -94,9 +94,7 @@ 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) -{ +static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) { void *res; /* if (n==0) { xbt_backtrace_display_current(); @@ -111,9 +109,7 @@ 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) -{ +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); @@ -124,9 +120,7 @@ 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) { @@ -142,31 +136,54 @@ void *xbt_realloc(void *p, size_t s) } 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 */ -#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); +SG_END_DECL() + /** @brief like calloc, but xbt_die() on error and don't memset to 0 @hideinitializer */ +#ifndef __cplusplus + #define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count))) /** @brief like calloc, but xbt_die() on error @hideinitializer */ #define xbt_new0(type, count) ((type*)xbt_malloc0 (sizeof (type) * (count))) -/** @} */ +#else + +/** C++ wrapper for xtb_new + * + * This ensures that we do not xbt_new things that need a constructor. + */ +template inline +T* xbt_new_(size_t count) +{ + static_assert(std::is_trivial(), + "Cannot xbt_new this type"); + return (T*) xbt_malloc(sizeof(T) * count); +} +template inline +T* xbt_new0_(size_t count) +{ + static_assert(std::is_trivial(), + "Cannot xbt_new0 this type"); + return (T*) xbt_malloc0(sizeof(T) * count); +} + +#define xbt_new(type, count) ::xbt_new_(count) +#define xbt_new0(type, count) ::xbt_new0_(count) + +#endif + +/** @} */ -SG_END_DECL() #endif /* _XBT_SYSDEP_H */