X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=include%2Fimpatomic.h;h=1b9ce6be97f9efdb23debaaa87c820406a65ccf2;hp=ae0796f0da4100de7d6c7a04623fb1388002303b;hb=130a35155171503883aaf18e57f8957ce63d06e8;hpb=89c68eaa8c88e6ff491a7611fdf94abddd7378ae diff --git a/include/impatomic.h b/include/impatomic.h index ae0796f..1b9ce6b 100644 --- a/include/impatomic.h +++ b/include/impatomic.h @@ -1,3 +1,11 @@ +/** + * @file impatomic.h + * @brief Common header for C11/C++11 atomics + * + * Note that some features are unavailable, as they require support from a true + * C11/C++11 compiler. + */ + #ifndef __IMPATOMIC_H__ #define __IMPATOMIC_H__ @@ -6,6 +14,8 @@ #ifdef __cplusplus namespace std { +#else +#include #endif #define CPP0X( feature ) @@ -15,7 +25,6 @@ typedef struct atomic_flag #ifdef __cplusplus bool test_and_set( memory_order = memory_order_seq_cst ) volatile; void clear( memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; CPP0X( atomic_flag() = default; ) CPP0X( atomic_flag( const atomic_flag& ) = delete; ) @@ -38,8 +47,6 @@ extern bool atomic_flag_test_and_set_explicit extern void atomic_flag_clear( volatile atomic_flag* ); extern void atomic_flag_clear_explicit ( volatile atomic_flag*, memory_order ); -extern void atomic_flag_fence -( const volatile atomic_flag*, memory_order ); extern void __atomic_flag_wait__ ( volatile atomic_flag* ); extern void __atomic_flag_wait_explicit__ @@ -57,9 +64,6 @@ inline bool atomic_flag::test_and_set( memory_order __x__ ) volatile inline void atomic_flag::clear( memory_order __x__ ) volatile { atomic_flag_clear_explicit( this, __x__ ); } -inline void atomic_flag::fence( memory_order __x__ ) const volatile -{ atomic_flag_fence( this, __x__ ); } - #endif @@ -84,14 +88,16 @@ inline void atomic_flag::fence( memory_order __x__ ) const volatile ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__); \ __typeof__(__m__) __v__ = (__m__); \ model_write_action((void *) __p__, __x__, (uint64_t) __v__); \ - __v__; }) + __v__ = __v__; /* Silence clang (-Wunused-value) */ \ + }) #define _ATOMIC_INIT_( __a__, __m__ ) \ ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__); \ __typeof__(__m__) __v__ = (__m__); \ model_init_action((void *) __p__, (uint64_t) __v__); \ - __v__; }) + __v__ = __v__; /* Silence clang (-Wunused-value) */ \ + }) #define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ ) \ ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__); \ @@ -100,7 +106,8 @@ inline void atomic_flag::fence( memory_order __x__ ) const volatile __typeof__((__a__)->__f__) __copy__= __old__; \ __copy__ __o__ __v__; \ model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__); \ - __old__; }) + __old__ = __old__; /* Silence clang (-Wunused-value) */ \ + }) /* No spurious failure for now */ #define _ATOMIC_CMPSWP_WEAK_ _ATOMIC_CMPSWP_ @@ -116,7 +123,7 @@ inline void atomic_flag::fence( memory_order __x__ ) const volatile else { model_rmwc_action((void *)__p__, __x__); *__q__ = __t__; __r__ = false;} \ __r__; }) -#define _ATOMIC_FENCE_( __a__, __x__ ) \ +#define _ATOMIC_FENCE_( __x__ ) \ ({ model_fence_action(__x__);}) @@ -143,7 +150,6 @@ typedef struct atomic_bool memory_order = memory_order_seq_cst) volatile; bool compare_exchange_strong ( bool&, bool, memory_order = memory_order_seq_cst) volatile; - void fence( memory_order ) const volatile; CPP0X( atomic_bool() = delete; ) CPP0X( constexpr explicit atomic_bool( bool __v__ ) : __f__( __v__ ) { } ) @@ -162,7 +168,6 @@ typedef struct atomic_bool memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_bool*, bool*, bool, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_bool*, memory_order ); CPP0X(private:) #endif @@ -183,7 +188,6 @@ typedef struct atomic_address memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( void*&, void*, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; void* fetch_add( ptrdiff_t, memory_order = memory_order_seq_cst ) volatile; void* fetch_sub( ptrdiff_t, memory_order = memory_order_seq_cst ) volatile; @@ -210,7 +214,6 @@ typedef struct atomic_address void**, void*, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_address*, void**, void*, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_address*, memory_order ); friend void* atomic_fetch_add_explicit( volatile atomic_address*, ptrdiff_t, memory_order ); friend void* atomic_fetch_sub_explicit( volatile atomic_address*, ptrdiff_t, @@ -239,7 +242,6 @@ typedef struct atomic_char memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( char&, char, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; char fetch_add( char, memory_order = memory_order_seq_cst ) volatile; char fetch_sub( char, @@ -296,7 +298,6 @@ typedef struct atomic_char char*, char, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_char*, char*, char, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_char*, memory_order ); friend char atomic_fetch_add_explicit( volatile atomic_char*, char, memory_order ); friend char atomic_fetch_sub_explicit( volatile atomic_char*, @@ -331,7 +332,6 @@ typedef struct atomic_schar memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( signed char&, signed char, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; signed char fetch_add( signed char, memory_order = memory_order_seq_cst ) volatile; signed char fetch_sub( signed char, @@ -388,7 +388,6 @@ typedef struct atomic_schar signed char*, signed char, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_schar*, signed char*, signed char, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_schar*, memory_order ); friend signed char atomic_fetch_add_explicit( volatile atomic_schar*, signed char, memory_order ); friend signed char atomic_fetch_sub_explicit( volatile atomic_schar*, @@ -423,7 +422,6 @@ typedef struct atomic_uchar memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( unsigned char&, unsigned char, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; unsigned char fetch_add( unsigned char, memory_order = memory_order_seq_cst ) volatile; unsigned char fetch_sub( unsigned char, @@ -480,7 +478,6 @@ typedef struct atomic_uchar unsigned char*, unsigned char, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_uchar*, unsigned char*, unsigned char, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_uchar*, memory_order ); friend unsigned char atomic_fetch_add_explicit( volatile atomic_uchar*, unsigned char, memory_order ); friend unsigned char atomic_fetch_sub_explicit( volatile atomic_uchar*, @@ -515,7 +512,6 @@ typedef struct atomic_short memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( short&, short, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; short fetch_add( short, memory_order = memory_order_seq_cst ) volatile; short fetch_sub( short, @@ -572,7 +568,6 @@ typedef struct atomic_short short*, short, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_short*, short*, short, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_short*, memory_order ); friend short atomic_fetch_add_explicit( volatile atomic_short*, short, memory_order ); friend short atomic_fetch_sub_explicit( volatile atomic_short*, @@ -607,7 +602,6 @@ typedef struct atomic_ushort memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( unsigned short&, unsigned short, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; unsigned short fetch_add( unsigned short, memory_order = memory_order_seq_cst ) volatile; unsigned short fetch_sub( unsigned short, @@ -664,7 +658,6 @@ typedef struct atomic_ushort unsigned short*, unsigned short, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_ushort*, unsigned short*, unsigned short, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_ushort*, memory_order ); friend unsigned short atomic_fetch_add_explicit( volatile atomic_ushort*, unsigned short, memory_order ); friend unsigned short atomic_fetch_sub_explicit( volatile atomic_ushort*, @@ -699,7 +692,6 @@ typedef struct atomic_int memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( int&, int, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; int fetch_add( int, memory_order = memory_order_seq_cst ) volatile; int fetch_sub( int, @@ -756,7 +748,6 @@ typedef struct atomic_int int*, int, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_int*, int*, int, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_int*, memory_order ); friend int atomic_fetch_add_explicit( volatile atomic_int*, int, memory_order ); friend int atomic_fetch_sub_explicit( volatile atomic_int*, @@ -791,7 +782,6 @@ typedef struct atomic_uint memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( unsigned int&, unsigned int, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; unsigned int fetch_add( unsigned int, memory_order = memory_order_seq_cst ) volatile; unsigned int fetch_sub( unsigned int, @@ -848,7 +838,6 @@ typedef struct atomic_uint unsigned int*, unsigned int, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_uint*, unsigned int*, unsigned int, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_uint*, memory_order ); friend unsigned int atomic_fetch_add_explicit( volatile atomic_uint*, unsigned int, memory_order ); friend unsigned int atomic_fetch_sub_explicit( volatile atomic_uint*, @@ -883,7 +872,6 @@ typedef struct atomic_long memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( long&, long, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; long fetch_add( long, memory_order = memory_order_seq_cst ) volatile; long fetch_sub( long, @@ -940,7 +928,6 @@ typedef struct atomic_long long*, long, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_long*, long*, long, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_long*, memory_order ); friend long atomic_fetch_add_explicit( volatile atomic_long*, long, memory_order ); friend long atomic_fetch_sub_explicit( volatile atomic_long*, @@ -975,7 +962,6 @@ typedef struct atomic_ulong memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( unsigned long&, unsigned long, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; unsigned long fetch_add( unsigned long, memory_order = memory_order_seq_cst ) volatile; unsigned long fetch_sub( unsigned long, @@ -1032,7 +1018,6 @@ typedef struct atomic_ulong unsigned long*, unsigned long, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_ulong*, unsigned long*, unsigned long, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_ulong*, memory_order ); friend unsigned long atomic_fetch_add_explicit( volatile atomic_ulong*, unsigned long, memory_order ); friend unsigned long atomic_fetch_sub_explicit( volatile atomic_ulong*, @@ -1067,7 +1052,6 @@ typedef struct atomic_llong memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( long long&, long long, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; long long fetch_add( long long, memory_order = memory_order_seq_cst ) volatile; long long fetch_sub( long long, @@ -1124,7 +1108,6 @@ typedef struct atomic_llong long long*, long long, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_llong*, long long*, long long, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_llong*, memory_order ); friend long long atomic_fetch_add_explicit( volatile atomic_llong*, long long, memory_order ); friend long long atomic_fetch_sub_explicit( volatile atomic_llong*, @@ -1159,7 +1142,6 @@ typedef struct atomic_ullong memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( unsigned long long&, unsigned long long, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; unsigned long long fetch_add( unsigned long long, memory_order = memory_order_seq_cst ) volatile; unsigned long long fetch_sub( unsigned long long, @@ -1216,7 +1198,6 @@ typedef struct atomic_ullong unsigned long long*, unsigned long long, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_ullong*, unsigned long long*, unsigned long long, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_ullong*, memory_order ); friend unsigned long long atomic_fetch_add_explicit( volatile atomic_ullong*, unsigned long long, memory_order ); friend unsigned long long atomic_fetch_sub_explicit( volatile atomic_ullong*, @@ -1283,7 +1264,6 @@ typedef struct atomic_wchar_t memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( wchar_t&, wchar_t, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; wchar_t fetch_add( wchar_t, memory_order = memory_order_seq_cst ) volatile; wchar_t fetch_sub( wchar_t, @@ -1340,7 +1320,6 @@ typedef struct atomic_wchar_t wchar_t*, wchar_t, memory_order, memory_order ); friend bool atomic_compare_exchange_strong_explicit( volatile atomic_wchar_t*, wchar_t*, wchar_t, memory_order, memory_order ); - friend void atomic_fence( const volatile atomic_wchar_t*, memory_order ); friend wchar_t atomic_fetch_add_explicit( volatile atomic_wchar_t*, wchar_t, memory_order ); friend wchar_t atomic_fetch_sub_explicit( volatile atomic_wchar_t*, @@ -1382,7 +1361,6 @@ struct atomic bool compare_exchange_strong( T&, T, memory_order, memory_order ) volatile; bool compare_exchange_weak( T&, T, memory_order = memory_order_seq_cst ) volatile; bool compare_exchange_strong( T&, T, memory_order = memory_order_seq_cst ) volatile; - void fence( memory_order ) const volatile; CPP0X( atomic() = default; ) CPP0X( constexpr explicit atomic( T __v__ ) : __f__( __v__ ) { } ) @@ -1645,6 +1623,10 @@ inline bool atomic_load_explicit inline bool atomic_load ( volatile atomic_bool* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_bool* __a__, bool __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_bool* __a__, bool __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1681,10 +1663,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_bool* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_address* __a__ ) { return false; } @@ -1696,6 +1674,10 @@ inline void* atomic_load_explicit inline void* atomic_load( volatile atomic_address* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_address* __a__, void* __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_address* __a__, void* __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1732,10 +1714,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_address* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_char* __a__ ) { return false; } @@ -1747,6 +1725,10 @@ inline char atomic_load_explicit inline char atomic_load( volatile atomic_char* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_char* __a__, char __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_char* __a__, char __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1783,10 +1765,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_char* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_schar* __a__ ) { return false; } @@ -1798,6 +1776,10 @@ inline signed char atomic_load_explicit inline signed char atomic_load( volatile atomic_schar* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_schar* __a__, signed char __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_schar* __a__, signed char __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1834,10 +1816,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_schar* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_uchar* __a__ ) { return false; } @@ -1849,6 +1827,10 @@ inline unsigned char atomic_load_explicit inline unsigned char atomic_load( volatile atomic_uchar* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_uchar* __a__, unsigned char __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_uchar* __a__, unsigned char __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1885,10 +1867,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_uchar* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_short* __a__ ) { return false; } @@ -1900,6 +1878,10 @@ inline short atomic_load_explicit inline short atomic_load( volatile atomic_short* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_short* __a__, short __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_short* __a__, short __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1936,10 +1918,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_short* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_ushort* __a__ ) { return false; } @@ -1951,6 +1929,10 @@ inline unsigned short atomic_load_explicit inline unsigned short atomic_load( volatile atomic_ushort* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_ushort* __a__, unsigned short __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_ushort* __a__, unsigned short __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -1987,10 +1969,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_ushort* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_int* __a__ ) { return false; } @@ -2002,6 +1980,10 @@ inline int atomic_load_explicit inline int atomic_load( volatile atomic_int* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_int* __a__, int __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_int* __a__, int __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2038,10 +2020,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_int* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_uint* __a__ ) { return false; } @@ -2053,6 +2031,10 @@ inline unsigned int atomic_load_explicit inline unsigned int atomic_load( volatile atomic_uint* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_uint* __a__, unsigned int __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_uint* __a__, unsigned int __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2089,10 +2071,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_uint* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_long* __a__ ) { return false; } @@ -2104,6 +2082,10 @@ inline long atomic_load_explicit inline long atomic_load( volatile atomic_long* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_long* __a__, long __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_long* __a__, long __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2140,10 +2122,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_long* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_ulong* __a__ ) { return false; } @@ -2155,6 +2133,10 @@ inline unsigned long atomic_load_explicit inline unsigned long atomic_load( volatile atomic_ulong* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_ulong* __a__, unsigned long __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_ulong* __a__, unsigned long __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2191,10 +2173,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_ulong* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_llong* __a__ ) { return false; } @@ -2206,6 +2184,10 @@ inline long long atomic_load_explicit inline long long atomic_load( volatile atomic_llong* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_llong* __a__, long long __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_llong* __a__, long long __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2242,10 +2224,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_llong* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_ullong* __a__ ) { return false; } @@ -2257,6 +2235,10 @@ inline unsigned long long atomic_load_explicit inline unsigned long long atomic_load( volatile atomic_ullong* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_ullong* __a__, unsigned long long __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_ullong* __a__, unsigned long long __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2293,10 +2275,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_ullong* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline bool atomic_is_lock_free( const volatile atomic_wchar_t* __a__ ) { return false; } @@ -2308,6 +2286,10 @@ inline wchar_t atomic_load_explicit inline wchar_t atomic_load( volatile atomic_wchar_t* __a__ ) { return atomic_load_explicit( __a__, memory_order_seq_cst ); } +inline void atomic_init +( volatile atomic_wchar_t* __a__, wchar_t __m__ ) +{ _ATOMIC_INIT_( __a__, __m__ ); } + inline void atomic_store_explicit ( volatile atomic_wchar_t* __a__, wchar_t __m__, memory_order __x__ ) { _ATOMIC_STORE_( __a__, __m__, __x__ ); } @@ -2344,10 +2326,6 @@ inline bool atomic_compare_exchange_strong { return atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, memory_order_seq_cst, memory_order_seq_cst ); } -inline void atomic_fence -( const volatile atomic_wchar_t* __a__, memory_order __x__ ) -{ _ATOMIC_FENCE_( __a__, __x__ ); } - inline void* atomic_fetch_add_explicit ( volatile atomic_address* __a__, ptrdiff_t __m__, memory_order __x__ ) @@ -2953,9 +2931,6 @@ _ATOMIC_CMPSWP_WEAK_( __a__, __e__, __m__, __x__ ) #define atomic_compare_exchange_strong_explicit( __a__, __e__, __m__, __x__, __y__ ) \ _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ ) -#define atomic_fence( __a__, __x__ ) \ -({ _ATOMIC_FENCE_( __a__, __x__ ); }) - #define atomic_fetch_add_explicit( __a__, __m__, __x__ ) \ _ATOMIC_MODIFY_( __a__, +=, __m__, __x__ ) @@ -3035,10 +3010,6 @@ inline bool atomic_bool::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_bool::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_address::is_lock_free() const volatile { return false; } @@ -3077,10 +3048,6 @@ inline bool atomic_address::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_address::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_char::is_lock_free() const volatile { return false; } @@ -3119,10 +3086,6 @@ inline bool atomic_char::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_char::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_schar::is_lock_free() const volatile { return false; } @@ -3161,10 +3124,6 @@ inline bool atomic_schar::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_schar::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_uchar::is_lock_free() const volatile { return false; } @@ -3203,10 +3162,6 @@ inline bool atomic_uchar::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_uchar::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_short::is_lock_free() const volatile { return false; } @@ -3245,10 +3200,6 @@ inline bool atomic_short::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_short::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_ushort::is_lock_free() const volatile { return false; } @@ -3287,10 +3238,6 @@ inline bool atomic_ushort::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_ushort::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_int::is_lock_free() const volatile { return false; } @@ -3329,10 +3276,6 @@ inline bool atomic_int::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_int::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_uint::is_lock_free() const volatile { return false; } @@ -3371,10 +3314,6 @@ inline bool atomic_uint::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_uint::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_long::is_lock_free() const volatile { return false; } @@ -3413,10 +3352,6 @@ inline bool atomic_long::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_long::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_ulong::is_lock_free() const volatile { return false; } @@ -3455,10 +3390,6 @@ inline bool atomic_ulong::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_ulong::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_llong::is_lock_free() const volatile { return false; } @@ -3497,10 +3428,6 @@ inline bool atomic_llong::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_llong::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_ullong::is_lock_free() const volatile { return false; } @@ -3539,10 +3466,6 @@ inline bool atomic_ullong::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_ullong::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - inline bool atomic_wchar_t::is_lock_free() const volatile { return false; } @@ -3581,10 +3504,6 @@ inline bool atomic_wchar_t::compare_exchange_strong __x__ == memory_order_acq_rel ? memory_order_acquire : __x__ == memory_order_release ? memory_order_relaxed : __x__ ); } -inline void atomic_wchar_t::fence -( memory_order __x__ ) const volatile -{ return atomic_fence( this, __x__ ); } - template< typename T > inline bool atomic::is_lock_free() const volatile @@ -3983,6 +3902,19 @@ T* atomic::fetch_sub( ptrdiff_t __v__, memory_order __x__ ) volatile #endif +#ifdef __cplusplus +extern "C" { +#endif +static inline void atomic_thread_fence(memory_order order) +{ _ATOMIC_FENCE_(order); } + +/** @todo Do we want to try to support a user's signal-handler? */ +static inline void atomic_signal_fence(memory_order order) +{ /* No-op? */ } +#ifdef __cplusplus +} +#endif + #ifdef __cplusplus } // namespace std