3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 07:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1458 from tkoeppe/master

Browse Source 
Add support for <atomic> in C++11
This commit is contained in:
Pieter Hintjens 2015-06-30 22:39:40 +02:00
commit f448dcde35
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/atomic_ptr.hpp
View File

@ -36,6 +36,8 @@
#define ZMQ_ATOMIC_PTR_MUTEX #define ZMQ_ATOMIC_PTR_MUTEX
#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
#define ZMQ_ATOMIC_PTR_INTRINSIC #define ZMQ_ATOMIC_PTR_INTRINSIC
#elif (defined ZMQ_CXX11 && defined __cplusplus && __cplusplus >= 201103L)
#define ZMQ_ATOMIC_CXX11
#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__ #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
#define ZMQ_ATOMIC_PTR_X86 #define ZMQ_ATOMIC_PTR_X86
#elif defined __ARM_ARCH_7A__ && defined __GNUC__ #elif defined __ARM_ARCH_7A__ && defined __GNUC__
@ -52,6 +54,8 @@
#if defined ZMQ_ATOMIC_PTR_MUTEX #if defined ZMQ_ATOMIC_PTR_MUTEX
#include "mutex.hpp" #include "mutex.hpp"
#elif defined ZMQ_ATOMIC_CXX11
#include <atomic>
#elif defined ZMQ_ATOMIC_PTR_WINDOWS #elif defined ZMQ_ATOMIC_PTR_WINDOWS
#include "windows.hpp" #include "windows.hpp"
#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H #elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
@ -96,6 +100,8 @@ namespace zmq
return (T*) InterlockedExchangePointer ((PVOID*) &ptr, val_); return (T*) InterlockedExchangePointer ((PVOID*) &ptr, val_);
#elif defined ZMQ_ATOMIC_PTR_INTRINSIC #elif defined ZMQ_ATOMIC_PTR_INTRINSIC
return (T*) __atomic_exchange_n (&ptr, val_, __ATOMIC_ACQ_REL); return (T*) __atomic_exchange_n (&ptr, val_, __ATOMIC_ACQ_REL);
#elif defined ZMQ_ATOMIC_CXX11
return ptr.exchange(val_, std::memory_order_acq_rel);
#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H #elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
return (T*) atomic_swap_ptr (&ptr, val_); return (T*) atomic_swap_ptr (&ptr, val_);
#elif defined ZMQ_ATOMIC_PTR_TILE #elif defined ZMQ_ATOMIC_PTR_TILE
@ -146,6 +152,9 @@ namespace zmq
__atomic_compare_exchange_n (&ptr, (volatile T**) &old, val_, false, __atomic_compare_exchange_n (&ptr, (volatile T**) &old, val_, false,
__ATOMIC_RELEASE, __ATOMIC_ACQUIRE); __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
return old; return old;
#elif defined ZMQ_ATOMIC_CXX11
ptr.compare_exchange_strong(cmp_, val_);
return cmp_;
#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H #elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
return (T*) atomic_cas_ptr (&ptr, cmp_, val_); return (T*) atomic_cas_ptr (&ptr, cmp_, val_);
#elif defined ZMQ_ATOMIC_PTR_TILE #elif defined ZMQ_ATOMIC_PTR_TILE
@ -189,13 +198,20 @@ namespace zmq
private: private:
#if defined ZMQ_ATOMIC_CXX11
std::atomic<T*> ptr;
#else
volatile T *ptr; volatile T *ptr;
#endif
#if defined ZMQ_ATOMIC_PTR_MUTEX #if defined ZMQ_ATOMIC_PTR_MUTEX
mutex_t sync; mutex_t sync;
#endif #endif
#if ! defined ZMQ_ATOMIC_CXX11
atomic_ptr_t (const atomic_ptr_t&); atomic_ptr_t (const atomic_ptr_t&);
const atomic_ptr_t &operator = (const atomic_ptr_t&); const atomic_ptr_t &operator = (const atomic_ptr_t&);
#endif
}; };
} }