mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make CV_XADD independent on STL and system headers

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-12 19:30:42 +04:00
parent 9f3ce0dd97
commit 013fd9bf59
2 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
modules/core/include/opencv2/core/operations.hpp
View File

@ -52,45 +52,39 @@
#ifdef __cplusplus #ifdef __cplusplus
/////// exchange-add operation for atomic operations on reference counters /////// /////// exchange-add operation for atomic operations on reference counters ///////
#if defined __INTEL_COMPILER && !(defined WIN32 || defined _WIN32) // atomic increment on the linux version of the Intel(tm) compiler #if defined __INTEL_COMPILER && !(defined WIN32 || defined _WIN32)
#define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta) // atomic increment on the linux version of the Intel(tm) compiler
#define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
#elif defined __GNUC__ #elif defined __GNUC__
#if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ #if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__
#ifdef __ATOMIC_SEQ_CST #ifdef __ATOMIC_ACQ_REL
#define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), (delta), __ATOMIC_SEQ_CST) #define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)
#else #else
#define CV_XADD(addr, delta) __atomic_fetch_add((_Atomic(int)*)(addr), (delta), 5) #define CV_XADD(addr, delta) __atomic_fetch_add((_Atomic(int)*)(addr), delta, 4)
#endif #endif
#elif __GNUC__*10 + __GNUC_MINOR__ >= 42
#if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \
defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__) || \
(defined __GNUC__ && defined _STLPORT_MAJOR)
#define CV_XADD __sync_fetch_and_add
#else
#include <ext/atomicity.h>
#define CV_XADD __gnu_cxx::__exchange_and_add
#endif
#else #else
#include <bits/atomicity.h> #ifdef __ATOMIC_ACQ_REL
#if __GNUC__*10 + __GNUC_MINOR__ >= 34 // version for gcc >= 4.7
#define CV_XADD __gnu_cxx::__exchange_and_add #define CV_XADD(addr, delta) __atomic_fetch_add(addr, delta, __ATOMIC_ACQ_REL)
#else #else
#define CV_XADD __exchange_and_add #define CV_XADD(addr, delta) __sync_fetch_and_add(addr, delta)
#endif #endif
#endif #endif
#elif (defined WIN32 || defined _WIN32 || defined WINCE) && (!defined RC_INVOKED)
#elif defined WIN32 || defined _WIN32 || defined WINCE #if !defined(_M_AMD64) && !defined(_M_IA64) && !defined(_M_ARM)
namespace cv { CV_EXPORTS int _interlockedExchangeAdd(int* addr, int delta); } extern "C" __declspec(dllimport) long __stdcall InterlockedExchangeAdd(long volatile *Addend, long Value);
#define CV_XADD cv::_interlockedExchangeAdd #define CV_XADD(addr, delta) (int)InterlockedExchangeAdd((long volatile*)addr, delta)
#else
extern "C" long _InterlockedExchangeAdd (long volatile *Addend, long Value);
#pragma intrinsic(_InterlockedExchangeAdd)
#define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd((long volatile*)addr, delta)
#endif
#else #else
static inline int CV_XADD(int* addr, int delta) static inline CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; }
{ int tmp = *addr; *addr += delta; return tmp; }
#endif #endif
#include <limits> #include <limits>
#ifdef _MSC_VER #ifdef _MSC_VER

11
modules/core/src/system.cpp
View File

@ -811,17 +811,6 @@ struct Mutex::Impl
int refcount; int refcount;
}; };
#ifndef __GNUC__
int _interlockedExchangeAdd(int* addr, int delta)
{
#if defined _MSC_VER && _MSC_VER >= 1500
return (int)_InterlockedExchangeAdd((long volatile*)addr, delta);
#else
return (int)InterlockedExchangeAdd((long volatile*)addr, delta);
#endif
}
#endif // __GNUC__
#elif defined __APPLE__ #elif defined __APPLE__
#include <libkern/OSAtomic.h> #include <libkern/OSAtomic.h>