FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Blasius Czink, "It seems there is no atomic_xor_uint_nv(). I

Browse Source 
attached a changed version of the Atomic header where a mutex fallback
is used for "xor" on solaris."
This commit is contained in:
Robert Osfield 2009-01-08 11:15:14 +00:00
parent 46eeac4514
commit 5275c11d06
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/OpenThreads/Atomic
View File

@ -23,6 +23,8 @@
#define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES #define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
#elif defined(_OPENTHREADS_ATOMIC_USE_SUN) #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
# include <atomic.h> # include <atomic.h>
# include "Mutex"
# include "ScopedLock"
#elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
# include <libkern/OSAtomic.h> # include <libkern/OSAtomic.h>
# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES # define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
@ -68,6 +70,7 @@ class OPENTHREAD_EXPORT_DIRECTIVE Atomic {
volatile int32_t _value; volatile int32_t _value;
#elif defined(_OPENTHREADS_ATOMIC_USE_SUN) #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
volatile uint_t _value; volatile uint_t _value;
mutable Mutex _mutex; // needed for xor
#else #else
volatile unsigned _value; volatile unsigned _value;
#endif #endif
@ -180,7 +183,10 @@ Atomic::XOR(unsigned value)
#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS) #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
return __xor_and_fetch(&_value, value); return __xor_and_fetch(&_value, value);
#elif defined(_OPENTHREADS_ATOMIC_USE_SUN) #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
return atomic_xor_uint_nv(&_value, value); //return atomic_xor_uint_nv(&_value, value);
ScopedLock<Mutex> lock(_mutex);
_value ^= value;
return _value;
#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX) #elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
ScopedLock<Mutex> lock(_mutex); ScopedLock<Mutex> lock(_mutex);
_value ^= value; _value ^= value;
@ -240,7 +246,7 @@ AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS) #elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew); return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew);
#elif defined(_OPENTHREADS_ATOMIC_USE_SUN) #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
return ptrOld == atomic_cas_ptr(&_ptr, ptrOld, ptrNew); return ptrOld == atomic_cas_ptr(&_ptr, (void *)ptrOld, (void *)ptrNew);
#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX) #elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
ScopedLock<Mutex> lock(_mutex); ScopedLock<Mutex> lock(_mutex);
if (_ptr != ptrOld) if (_ptr != ptrOld)