added santiy checks to mutexes

diff --git a/src/locks/Mutex.cpp b/src/locks/Mutex.cpp
index a533e83..e4004c6 100644 (file)
--- a/src/locks/Mutex.cpp
+++ b/src/locks/Mutex.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "Mutex.h"
+#include "debug.h"
 
 #include <SDL/SDL.h>
 
@@ -46,11 +47,15 @@ bool Mutex::IsValid()
 
 void Mutex::Lock()
 {
-    if(IsValid())
-        SDL_mutexP(m_pSDL_mutex);
+    DASSERT(IsValid());
+
+    SDL_mutexP(m_pSDL_mutex);
+    m_uiThreadID = SDL_ThreadID();
 }
 void Mutex::Unlock()
 {
-    if(IsValid())
-        SDL_mutexV(m_pSDL_mutex);
+    DASSERT(IsValid());
+
+    DASSERT(m_uiThreadID == SDL_ThreadID());
+    SDL_mutexV(m_pSDL_mutex);
 }

diff --git a/src/locks/Mutex.h b/src/locks/Mutex.h
index fdba961..cac4d94 100644 (file)
--- a/src/locks/Mutex.h
+++ b/src/locks/Mutex.h
@@ -43,7 +43,8 @@ private:
     const Mutex& operator ==(const Mutex&);
 
 private:
-    SDL_mutex* m_pSDL_mutex;
+    SDL_mutex*   m_pSDL_mutex;
+    unsigned int m_uiThreadID;
 };
 
 #endif // MUTEX_H