Changeset 8726 in vbox

Timestamp:

May 8, 2008 7:48:48 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30675

Message:

Main/AutoLock: Sanity.

File:

• trunk/src/VBox/Main/AutoLock.cpp (modified) (1 diff)

trunk/src/VBox/Main/AutoLock.cpp

@@ -291 +291 @@
     RTCritSectEnter (&mCritSect);
 
+    RTNATIVETHREAD threadSelf = RTThreadNativeSelf();
+
     Assert (mWriteLockLevel != 0 /* unlockWrite() w/o preceding lockWrite()? */);
     if (mWriteLockLevel != 0)
     {
-        -- mWriteLockLevel;
-        if (mWriteLockLevel == 0)
-        {
-            Assert (mSelfReadLockCount == 0
-                    /* mixed unlockWrite()/unlockRead() order? */);
-
-            mWriteLockThread = NIL_RTNATIVETHREAD;
-
-            /* no write locks, let writers go if there are any (top priority),
-             * otherwise let readers go if there are any */
-            if (mWriteLockPending != 0)
-                RTSemEventSignal (mGoWriteSem);
-            else if (mReadLockCount != 0)
-                RTSemEventMultiSignal (mGoReadSem);
+        Assert (mWriteLockThread == threadSelf
+                /* unlockWrite() w/o preceding lockWrite()? */);
+        if (mWriteLockThread == threadSelf)
+        {
+            -- mWriteLockLevel;
+            if (mWriteLockLevel == 0)
+            {
+                Assert (mSelfReadLockCount == 0
+                        /* mixed unlockWrite()/unlockRead() order? */);
+
+                mWriteLockThread = NIL_RTNATIVETHREAD;
+
+                /* no write locks, let writers go if there are any (top priority),
+                 * otherwise let readers go if there are any */
+                if (mWriteLockPending != 0)
+                    RTSemEventSignal (mGoWriteSem);
+                else if (mReadLockCount != 0)
+                    RTSemEventMultiSignal (mGoReadSem);
 
 # ifdef DEBUG
-            RTTHREAD iprtThreadSelf = RTThreadSelf();
-            if (iprtThreadSelf != NIL_RTTHREAD)
-                RTThreadWriteLockDec (iprtThreadSelf);
-# endif
+                RTTHREAD iprtThreadSelf = RTThreadSelf();
+                if (iprtThreadSelf != NIL_RTTHREAD)
+                    RTThreadWriteLockDec (iprtThreadSelf);
+# endif
+            }
         }
     }