summaryrefslogtreecommitdiff
path: root/src/threading
diff options
context:
space:
mode:
Diffstat (limited to 'src/threading')
-rw-r--r--src/threading/mutex.cpp16
-rw-r--r--src/threading/mutex.h2
2 files changed, 14 insertions, 4 deletions
diff --git a/src/threading/mutex.cpp b/src/threading/mutex.cpp
index eb1c7d61d..e12b79185 100644
--- a/src/threading/mutex.cpp
+++ b/src/threading/mutex.cpp
@@ -34,15 +34,25 @@ DEALINGS IN THE SOFTWARE.
#define UNUSED(expr) do { (void)(expr); } while (0)
-
-Mutex::Mutex()
+Mutex::Mutex(bool recursive)
{
#ifdef _WIN32
+ // Windows critical sections are recursive by default
+ UNUSED(recursive);
+
InitializeCriticalSection(&mutex);
#else
- int ret = pthread_mutex_init(&mutex, NULL);
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init(&attr);
+
+ if (recursive)
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+ int ret = pthread_mutex_init(&mutex, &attr);
assert(!ret);
UNUSED(ret);
+
+ pthread_mutexattr_destroy(&attr);
#endif
}
diff --git a/src/threading/mutex.h b/src/threading/mutex.h
index f1a4882b7..62a482787 100644
--- a/src/threading/mutex.h
+++ b/src/threading/mutex.h
@@ -49,7 +49,7 @@ DEALINGS IN THE SOFTWARE.
class Mutex
{
public:
- Mutex();
+ Mutex(bool recursive=false);
~Mutex();
void lock();
void unlock();