X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9856e530871afa8c75fda68ab7cbc718e9ba7e95..978c69bf0a49adab13df9ba6dabcd0998485030b:/include/xbt/base.h diff --git a/include/xbt/base.h b/include/xbt/base.h index 8698afe6de..080c784e78 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -1,6 +1,6 @@ -/* xbt.h - Public interface to the xbt (simgrid's toolbox) */ +/* xbt.h - Public interface to the xbt (SimGrid's toolbox) */ -/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2023. 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. */ @@ -13,19 +13,8 @@ # define _GNU_SOURCE #endif -/* On MinGW, stdio.h defines __MINGW_PRINTF_FORMAT and __MINGW_SCANF_FORMAT - which are the suitable format style (either gnu_printf or ms_printf) - depending on which version is available (__USE_MINGW_ANSI_STDIO): */ -#ifdef __MINGW32__ -# include - -#define XBT_ATTRIB_PRINTF(format_idx, arg_idx) \ - __attribute__((__format__(__MINGW_PRINTF_FORMAT, (format_idx), (arg_idx)))) -#define XBT_ATTRIB_SCANF(format_idx, arg_idx) __attribute__((__MINGW_SCANF_FORMAT(__scanf__, (format_idx), (arg_idx)))) -#else #define XBT_ATTRIB_PRINTF(format_idx, arg_idx) __attribute__((__format__(__printf__, (format_idx), (arg_idx)))) #define XBT_ATTRIB_SCANF(format_idx, arg_idx) __attribute__((__format__(__scanf__, (format_idx), (arg_idx)))) -#endif #if defined(__cplusplus) #if __cplusplus >= 201103L @@ -53,14 +42,10 @@ #define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg))) #endif -#define XBT_ATTRIB_DEPRECATED_v332(mesg) \ - XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.31)") -#define XBT_ATTRIB_DEPRECATED_v333(mesg) \ - XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.32)") -#define XBT_ATTRIB_DEPRECATED_v334(mesg) \ - XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.33)") -#define XBT_ATTRIB_DEPRECATED_v335(mesg) \ - XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.34)") +#define XBT_ATTRIB_DEPRECATED_v338(mesg) \ + XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.37)") +#define XBT_ATTRIB_DEPRECATED_v339(mesg) \ + XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.38)") /* Work around https://github.com/microsoft/vscode-cpptools/issues/4503 */ #ifdef __INTELLISENSE__ @@ -75,12 +60,12 @@ # define XBT_ATTRIB_DESTRUCTOR(prio) __attribute__((__destructor__)) #endif -#ifndef XBT_ALWAYS_INLINE /* defined also in libsosp */ -# if defined(__GNUC__) -# define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline)) -# else -# define XBT_ALWAYS_INLINE inline -# endif +#define XBT_ATTRIB_NOINLINE __attribute__((noinline)) + +#if defined(__GNUC__) +#define XBT_ALWAYS_INLINE inline __attribute__((always_inline)) +#else +#define XBT_ALWAYS_INLINE inline #endif /* Stringify argument. */ @@ -148,64 +133,27 @@ #define _XBT_STRINGIFY_A_22_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_23_, __VA_ARGS__)(__VA_ARGS__) #define _XBT_STRINGIFY_A_23_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_24_, __VA_ARGS__)(__VA_ARGS__) #define _XBT_STRINGIFY_A_24_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_25_, __VA_ARGS__)(__VA_ARGS__) -#define _XBT_STRINGIFY_A_25_(...) error_maximum_size_of_XBT_STRINGIFY_ARGS_reached - -/* Handle import/export stuff - * - * Rationale of XBT_PUBLIC: +#define _XBT_STRINGIFY_A_25_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_26_, __VA_ARGS__)(__VA_ARGS__) +#define _XBT_STRINGIFY_A_26_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_27_, __VA_ARGS__)(__VA_ARGS__) +#define _XBT_STRINGIFY_A_27_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_28_, __VA_ARGS__)(__VA_ARGS__) +#define _XBT_STRINGIFY_A_28_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_29_, __VA_ARGS__)(__VA_ARGS__) +#define _XBT_STRINGIFY_A_29_(a, ...) #a, _XBT_IF_ONE_ARG(_XBT_STRINGIFY, _XBT_STRINGIFY_A_30_, __VA_ARGS__)(__VA_ARGS__) +#define _XBT_STRINGIFY_A_30_(...) error_maximum_size_of_XBT_STRINGIFY_ARGS_reached + +/* Rationale of XBT_PUBLIC: * * This is for library symbols visible from the application-land. * Basically, any symbols defined in the include/directory must be like this (plus some other globals). * - * UNIX coders should just think of it as a special way to say "extern". - * - * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols actually get exported by this file. - * - * * If you link your application against the DLL or if you do a UNIX build, don't do anything special. This file - * will do the right thing for you by default. - * - * Rationale of XBT_EXPORT_NO_IMPORT: (windows-only) - * * Symbols which must be exported in the DLL, but not imported from it. - * - * * This is obviously useful for initialized globals (which cannot be extern or similar). - * * This is also used in the log mechanism where a macro creates the variable automatically. When the macro is - * called from within SimGrid, the symbol must be exported, but when called from within the client code, it must - * not try to retrieve the symbol from the DLL since it's not in there. - * - * Rationale of XBT_IMPORT_NO_EXPORT: (windows-only) - * * Symbols which must be imported from the DLL, but not explicitly exported from it. - * - * * The root log category is already exported, but not imported explicitly when creating a subcategory since we - * cannot import the parent category to deal with the fact that the parent may be in application space, not DLL - * space. + * Just think of it as a special way to say "extern". */ -/* Build the DLL */ -#if defined(DLL_EXPORT) -# define XBT_PUBLIC __declspec(dllexport) -# define XBT_EXPORT_NO_IMPORT __declspec(dllexport) -# define XBT_IMPORT_NO_EXPORT -# define XBT_PUBLIC_DATA extern __declspec(dllexport) -# define XBT_PRIVATE - -/* Link against the DLL */ -#elif (defined(_WIN32) && !defined(DLL_EXPORT)) -# define XBT_PUBLIC __declspec(dllimport) -# define XBT_EXPORT_NO_IMPORT -# define XBT_IMPORT_NO_EXPORT __declspec(dllimport) -# define XBT_PUBLIC_DATA extern __declspec(dllimport) -# define XBT_PRIVATE - -#elif defined(__ELF__) -# define XBT_PUBLIC __attribute__((visibility("default"))) -# define XBT_EXPORT_NO_IMPORT __attribute__((visibility("default"))) -# define XBT_IMPORT_NO_EXPORT __attribute__((visibility("default"))) +#if defined(__ELF__) +#define XBT_PUBLIC __attribute__((visibility("default"))) # define XBT_PUBLIC_DATA extern __attribute__((visibility("default"))) # define XBT_PRIVATE __attribute__((visibility("hidden"))) #else -# define XBT_PUBLIC /* public */ -# define XBT_EXPORT_NO_IMPORT -# define XBT_IMPORT_NO_EXPORT +#define XBT_PUBLIC /* public */ # define XBT_PUBLIC_DATA extern # define XBT_PRIVATE /** @private */