|
|
@ -20,7 +20,7 @@
|
|
|
|
////////////////////////////////////////////////
|
|
|
|
////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
CCriticalSection mutex;
|
|
|
|
RecursiveMutex mutex;
|
|
|
|
std::recursive_mutex mutex;
|
|
|
|
std::recursive_mutex mutex;
|
|
|
|
|
|
|
|
|
|
|
|
LOCK(mutex);
|
|
|
|
LOCK(mutex);
|
|
|
@ -104,6 +104,7 @@ public:
|
|
|
|
* Wrapped mutex: supports recursive locking, but no waiting
|
|
|
|
* Wrapped mutex: supports recursive locking, but no waiting
|
|
|
|
* TODO: We should move away from using the recursive lock by default.
|
|
|
|
* TODO: We should move away from using the recursive lock by default.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
using RecursiveMutex = AnnotatedMixin<std::recursive_mutex>;
|
|
|
|
typedef AnnotatedMixin<std::recursive_mutex> CCriticalSection;
|
|
|
|
typedef AnnotatedMixin<std::recursive_mutex> CCriticalSection;
|
|
|
|
|
|
|
|
|
|
|
|
/** Wrapped mutex: supports waiting but not recursive locking */
|
|
|
|
/** Wrapped mutex: supports waiting but not recursive locking */
|
|
|
|