Skip to content

Fixes when not using TBB #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
edgarv wants to merge 2 commits into from
Closed

Fixes when not using TBB #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8537970
Fix a compilation error when not using TBB.
edgarv Jul 7, 2011
2d9a1ee
Improved intrinsics when not using TBB.
edgarv Jul 7, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions src/include/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,15 @@
# include <tbb/spin_mutex.h>
#endif

#ifdef _WIN32
#if defined(_WIN32) && !USE_TBB
# include <windows.h>
# include <winbase.h>
# pragma intrinsic (_InterlockedExchangeAdd)
# pragma intrinsic (_InterlockedCompareExchange)
# pragma intrinsic (_InterlockedCompareExchange64)
# if defined(_WIN64)
# pragma intrinsic(_InterlockedExchangeAdd64)
# endif
#endif

#ifdef __APPLE__
Expand Down Expand Up @@ -250,7 +256,7 @@ class unique_lock {
inline int
atomic_exchange_and_add (volatile int *at, int x)
{
#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
return __sync_fetch_and_add ((int *)at, x);
#elif USE_TBB
atomic<int> *a = (atomic<int> *)at;
Expand All @@ -260,9 +266,9 @@ atomic_exchange_and_add (volatile int *at, int x)
return OSAtomicAdd32Barrier (x, at) - x;
#elif defined(_WIN32)
// Windows
return InterlockedExchangeAdd ((volatile LONG *)at, x);
return _InterlockedExchangeAdd ((volatile LONG *)at, x);
#else
error ("No atomics on this platform.")
# error No atomics on this platform.
#endif
}

Expand All @@ -271,7 +277,7 @@ atomic_exchange_and_add (volatile int *at, int x)
inline long long
atomic_exchange_and_add (volatile long long *at, long long x)
{
#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
return __sync_fetch_and_add (at, x);
#elif USE_TBB
atomic<long long> *a = (atomic<long long> *)at;
Expand All @@ -281,9 +287,13 @@ atomic_exchange_and_add (volatile long long *at, long long x)
return OSAtomicAdd64Barrier (x, at) - x;
#elif defined(_WIN32)
// Windows
# if defined(_WIN64)
return _InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
# else
return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
# endif
#else
error ("No atomics on this platform.")
# error No atomics on this platform.
#endif
}

Expand All @@ -298,17 +308,17 @@ atomic_exchange_and_add (volatile long long *at, long long x)
inline bool
atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
{
#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
return __sync_bool_compare_and_swap (at, compareval, newval);
#elif USE_TBB
atomic<int> *a = (atomic<int> *)at;
return a->compare_and_swap (newval, compareval) == newval;
#elif defined(__APPLE__)
return OSAtomicCompareAndSwap32Barrier (compareval, newval, at);
#elif defined(_WIN32)
return (InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
return (_InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
#else
error ("No atomics on this platform.")
# error No atomics on this platform.
#endif
}

Expand All @@ -317,17 +327,17 @@ atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
inline bool
atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
{
#if defined(__GNUC__) && defined(_GLIBCXX_ATOMIC_BUILTINS)
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
return __sync_bool_compare_and_swap (at, compareval, newval);
#elif USE_TBB
atomic<long long> *a = (atomic<long long> *)at;
return a->compare_and_swap (newval, compareval) == newval;
#elif defined(__APPLE__)
return OSAtomicCompareAndSwap64Barrier (compareval, newval, at);
#elif defined(_WIN32)
return (InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);
#else
error ("No atomics on this platform.")
# error No atomics on this platform.
#endif
}

Expand Down
3 changes: 3 additions & 0 deletions src/maketx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
if (NOT USE_TBB)
add_definitions ("-DUSE_TBB=0")
endif ()
set (maketx_srcs maketx.cpp)
add_executable (maketx ${maketx_srcs})
link_ilmbase (maketx)
Expand Down