diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2009-12-08 19:54:47 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-12-08 19:54:47 -0330 |
| commit | 87c2b141d0fe879562c8732ca209212306ab8a7d (patch) | |
| tree | c4d909e9dc1d0491cdb1f9234e2ab1c6418be5c1 /cpp/src | |
| parent | fixing build.xml for fileLock test (diff) | |
| download | ice-87c2b141d0fe879562c8732ca209212306ab8a7d.tar.bz2 ice-87c2b141d0fe879562c8732ca209212306ab8a7d.tar.xz ice-87c2b141d0fe879562c8732ca209212306ab8a7d.zip | |
http://bugzilla/bugzilla/show_bug.cgi?id=4203 - Use gcc native atomic functions
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/Shared.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp index 2c0205a4265..c25e8e74ee6 100644 --- a/cpp/src/IceUtil/Shared.cpp +++ b/cpp/src/IceUtil/Shared.cpp @@ -114,6 +114,9 @@ IceUtil::Shared::__incRef() #if defined(_WIN32) assert(InterlockedExchangeAdd(&_ref, 0) >= 0); InterlockedIncrement(&_ref); +#elif defined(ICE_HAS_GCC_BUILTINS) + int c = __sync_fetch_and_add(&_ref, 1); + assert(c >= 0); #elif defined(ICE_HAS_ATOMIC_FUNCTIONS) assert(IceUtilInternal::atomicExchangeAdd(&_ref, 0) >= 0); IceUtilInternal::atomicInc(&_ref); @@ -135,6 +138,14 @@ IceUtil::Shared::__decRef() _noDelete = true; delete this; } +#elif defined(ICE_HAS_GCC_BUILTINS) + int c = __sync_fetch_and_sub(&_ref, 1); + assert(c > 0); + if(c == 1 && !_noDelete) + { + _noDelete = true; + delete this; + } #elif defined(ICE_HAS_ATOMIC_FUNCTIONS) assert(IceUtilInternal::atomicExchangeAdd(&_ref, 0) > 0); if(IceUtilInternal::atomicDecAndTest(&_ref) && !_noDelete) @@ -164,6 +175,8 @@ IceUtil::Shared::__getRef() const { #if defined(_WIN32) return InterlockedExchangeAdd(const_cast<LONG*>(&_ref), 0); +#elif defined(ICE_HAS_GCC_BUILTINS) + return __sync_fetch_and_sub(const_cast<volatile int*>(&_ref), 0); #elif defined(ICE_HAS_ATOMIC_FUNCTIONS) return IceUtilInternal::atomicExchangeAdd(const_cast<volatile int*>(&_ref), 0); #else |