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

From Mathias Froechlich, "Attached is a change to that atomic stuff to move the win32, msvc

Browse Source 
implementation of the atomic increment and decrement into a implementation
file.
This way inlining and compiler optimization can no longer happen for these
implementations, but it fixes compilation on win32 msvc targets. I expect
that this is still faster than with with mutexes.

Also the i386 gcc target gets atomic operations with this patch. By using an
implementation file we can guarantee that we have the right compiler flags
available."
This commit is contained in:
Robert Osfield
2008-06-26 10:27:16 +00:00
parent 37765805ff
commit 5a4ce5a387
6 changed files with 231 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeModules/CheckAtomicOps.cmake
View File

@@ -10,14 +10,6 @@ CHECK_CXX_SOURCE_RUNS("
int main()
{
#ifdef __i386__
// Bad, gcc behaves dependent on the compilers -march=... flags.
// Since the osg::Referenced stuff is code distributed in headers, it is
// unclear if we will have this feature available at compile time of the
// headers. So just do not use this feature for 32 bit code.
// May be we can implement around that limitation at some time..
return EXIT_FAILURE;
#else
unsigned value = 0;
void* ptr = &value;
__sync_add_and_fetch(&value, 1);
@@ -30,12 +22,11 @@ int main()
return EXIT_FAILURE;
return EXIT_SUCCESS;
#endif
}
" _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
CHECK_CXX_SOURCE_RUNS("
#include <cstdlib>
#include <stdlib.h>
int main(int, const char**)
{
@@ -44,10 +35,10 @@ int main(int, const char**)
__add_and_fetch(&value, 1);
__synchronize(value);
__sub_and_fetch(&value, 1);
if (!__sync_compare_and_swap(&value, 0, 1))
if (!__compare_and_swap(&value, 0, 1))
return EXIT_FAILURE;
if (!__sync_compare_and_swap(&ptr, ptr, ptr))
if (!__compare_and_swap((unsigned long*)&ptr, (unsigned long)ptr, (unsigned long)ptr))
return EXIT_FAILURE;
return EXIT_SUCCESS;