Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use of BSD function OSAtomicCompareAndSwap32 under Mac OS X

Browse source
This commit is contained in:
kervala 2010-10-05 21:35:17 +02:00
parent d303839620
commit d55f1b6d5f
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
code/nel/include/nel/misc/mutex.h
View file

@ -22,17 +22,19 @@
#include "common.h"
#include <map>
#ifdef NL_OS_UNIX
//#include <iostream>
#ifdef NL_OS_WINDOWS
# ifdef NL_NO_ASM
# include <intrin.h>
# endif
#elif defined(NL_OS_UNIX)
# include <pthread.h> // PThread
# include <semaphore.h> // PThread POSIX semaphores
# include <unistd.h>
# define __forceinline
#elif defined(NL_OS_WINDOWS)
# ifdef NL_NO_ASM
# include <intrin.h>
# endif
# ifdef NL_OS_MAC
# include <libkern/OSAtomic.h>
# endif
#endif // NL_OS_WINDOWS
#undef MUTEX_DEBUG
@ -245,12 +247,18 @@ public:
}
# endif // NL_DEBUG
# endif // NL_NO_ASM
#else
#elif defined(NL_OS_MAC)
return OSAtomicCompareAndSwap32(0, 1, reinterpret_cast<volatile sint32 *>(lockPtr));
#elif defined(NL_OS_UNIX)
// GCC implements the same functionality using a builtin function
// http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html
// the macro below crashed on Mac OS X 10.6 in a 64bit build
//ASM_ASWAP_FOR_GCC_XCHG
result = __sync_bool_compare_and_swap(lockPtr, 0, 1);
# if (GCC_VERSION > 40100)
// return __sync_bool_compare_and_swap(lockPtr, 0, 1);
result = __sync_val_compare_and_swap(lockPtr, 0, 1);
# else
ASM_ASWAP_FOR_GCC_XCHG
# endif
#endif // NL_OS_WINDOWS
return result != 0;
}