Changeset 8508 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 30, 2008 2:29:20 PM (17 years ago)

Author:

vboxsync

Message:

Main/AutoLock: Added self deadlock detector (affects release builds too). Undef VBOX_MAIN_AUTOLOCK_TRAP in AutoLock.h to disable it.

Location:

trunk/src/VBox/Main

Files:

• AutoLock.cpp (modified) (12 diffs)
• include/AutoLock.h (modified) (3 diffs)

trunk/src/VBox/Main/AutoLock.cpp

@@ -27 +27 @@
 {
 
+
 RWLockHandle::RWLockHandle()
 {
@@ -53 +54 @@
 #endif /* VBOX_MAIN_USE_SEMRW */
 }
+
 
 RWLockHandle::~RWLockHandle()
@@ -69 +71 @@
 }
 
+
 bool RWLockHandle::isWriteLockOnCurrentThread() const
 {
@@ -85 +88 @@
 }
 
+
 void RWLockHandle::lockWrite()
 {
@@ -100 +104 @@
     if (mWriteLockThread != threadSelf)
     {
+# ifdef VBOX_MAIN_AUTOLOCK_TRAP
+        if (mReadLockCount != 0)
+        {
+            ReaderMap::const_iterator reader = mReaders.find (threadSelf);
+            if (reader != mReaders.end() && reader->second != 0)
+            {
+                AssertReleaseMsgFailedReturnVoid ((
+                    "SELF DEADLOCK DETECTED on Thread %0x: lockWrite() after "
+                    "lockRead(): reader count = %d!\n",
+                    threadSelf, reader->second));
+            }
+        }
+# endif /* VBOX_MAIN_AUTOLOCK_TRAP */
+
         if (mReadLockCount != 0 || mWriteLockThread != NIL_RTNATIVETHREAD ||
             mWriteLockPending != 0 /* respect other pending writers */)
@@ -127 +145 @@
 }
 
+
 void RWLockHandle::unlockWrite()
 {
@@ -163 +182 @@
 }
 
+
 void RWLockHandle::lockRead()
 {
@@ -175 +195 @@
 
     RTNATIVETHREAD threadSelf = RTThreadNativeSelf();
+
+# ifdef VBOX_MAIN_AUTOLOCK_TRAP
+    if (!mReaders.count (threadSelf))
+        mReaders [threadSelf] = 0;
+    ++ mReaders [threadSelf];
+# endif /* VBOX_MAIN_AUTOLOCK_TRAP */
 
     bool isWriteLock = mWriteLockLevel != 0;
@@ -223 +249 @@
 }
 
+
 void RWLockHandle::unlockRead()
 {
@@ -248 +275 @@
             {
                 -- mSelfReadLockCount;
+
+# ifdef VBOX_MAIN_AUTOLOCK_TRAP
+                -- mReaders [threadSelf];
+# endif /* VBOX_MAIN_AUTOLOCK_TRAP */
             }
         }
@@ -264 +295 @@
                     RTSemEventSignal (mGoWriteSem);
             }
-        }
-    }
-
-    RTCritSectLeave (&mCritSect);
-
-#endif /* VBOX_MAIN_USE_SEMRW */
-}
+
+# ifdef VBOX_MAIN_AUTOLOCK_TRAP
+            -- mReaders [threadSelf];
+# endif /* VBOX_MAIN_AUTOLOCK_TRAP */
+        }
+    }
+
+    RTCritSectLeave (&mCritSect);
+
+#endif /* VBOX_MAIN_USE_SEMRW */
+}
+
 
 uint32_t RWLockHandle::writeLockLevel() const
@@ -287 +323 @@
 }
 
+
 } /* namespace util */
 

trunk/src/VBox/Main/include/AutoLock.h

@@ -23 +23 @@
 #define ____H_AUTOLOCK
 
+/// @todo temporary
+#define VBOX_MAIN_AUTOLOCK_TRAP
+
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
@@ -38 +41 @@
 #ifdef VBOX_MAIN_USE_SEMRW
 # include <iprt/semaphore.h>
+#else
+# ifdef VBOX_MAIN_AUTOLOCK_TRAP
+#  include <map>
+# endif
 #endif
 
@@ -198 +205 @@
     uint32_t mWriteLockLevel;
     uint32_t mWriteLockPending;
+
+# ifdef VBOX_MAIN_AUTOLOCK_TRAP
+
+    typedef std::map <RTNATIVETHREAD, uint32_t> ReaderMap;
+    ReaderMap mReaders;
+
+# endif /* VBOX_MAIN_AUTOLOCK_TRAP */
 
 #endif /* VBOX_MAIN_USE_SEMRW */