blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Cycles: Use TBB's spin mutex 

First benefit is reduced boilerplate code.

Second benefit is fixed warnings about using deprecated spin lock
on macOS when using SDK 10.12 and above.

Differential Revision: https://developer.blender.org/D8182
This commit is contained in:
Sergey Sharybin 2020-07-02 17:05:34 +02:00
parent 0e1ee29f77
commit 746aec51a7
1 changed files with 4 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
intern/cycles/util/util_thread.h
View File

@ -29,9 +29,9 @@
# include <pthread.h>
#endif
#ifdef __APPLE__
# include <libkern/OSAtomic.h>
#endif
/* NOTE: Use tbb/spin_mutex.h instead of util_tbb.h because some of the TBB
* functionality requires RTTI, which is disabled for OSL kernel. */
#include <tbb/spin_mutex.h>
#include "util/util_function.h"
@ -65,76 +65,7 @@ class thread {
int node_;
};
/* Own wrapper around pthread's spin lock to make it's use easier. */
class thread_spin_lock {
public:
#ifdef __APPLE__
inline thread_spin_lock()
{
spin_ = OS_SPINLOCK_INIT;
}
inline void lock()
{
OSSpinLockLock(&spin_);
}
inline void unlock()
{
OSSpinLockUnlock(&spin_);
}
#elif defined(_WIN32)
inline thread_spin_lock()
{
const DWORD SPIN_COUNT = 50000;
InitializeCriticalSectionAndSpinCount(&cs_, SPIN_COUNT);
}
inline ~thread_spin_lock()
{
DeleteCriticalSection(&cs_);
}
inline void lock()
{
EnterCriticalSection(&cs_);
}
inline void unlock()
{
LeaveCriticalSection(&cs_);
}
#else
inline thread_spin_lock()
{
pthread_spin_init(&spin_, 0);
}
inline ~thread_spin_lock()
{
pthread_spin_destroy(&spin_);
}
inline void lock()
{
pthread_spin_lock(&spin_);
}
inline void unlock()
{
pthread_spin_unlock(&spin_);
}
#endif
protected:
#ifdef __APPLE__
OSSpinLock spin_;
#elif defined(_WIN32)
CRITICAL_SECTION cs_;
#else
pthread_spinlock_t spin_;
#endif
};
using thread_spin_lock = tbb::spin_mutex;
class thread_scoped_spin_lock {
public: