Changeset 25881 in vbox

Timestamp:

Jan 18, 2010 11:29:12 AM (15 years ago)

Author:

vboxsync

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

56689

Message:

Main: remove unused and broken autolock code

Location:

trunk

Files:

• include/VBox/com/AutoLock.h (modified) (2 diffs)
• src/VBox/Main/glue/AutoLock.cpp (modified) (1 diff)

trunk/include/VBox/com/AutoLock.h

@@ -388 +388 @@
  *
  * In addition to utility methods for subclasses, this implements the public
- * leave/enter/maybeLeave/maybeEnter methods, which are common to all
+ * leave/enter/maybeEnter methods, which are common to all
  * write locks.
  */
@@ -417 +417 @@
     void leave();
     void enter();
-    void maybeLeave();
     void maybeEnter();
 };

trunk/src/VBox/Main/glue/AutoLock.cpp

@@ -625 +625 @@
 
 /**
- * Same as #leave() but checks if the current thread actally owns the lock
- * and only proceeds in this case. As a result, as opposed to #leave(),
- * doesn't assert when called with no lock being held.
- */
-void AutoWriteLockBase::maybeLeave()
-{
-    // unlock in reverse order!
-    uint32_t i = m->aHandles.size();
-    for (HandlesVector::reverse_iterator it = m->aHandles.rbegin();
-         it != m->aHandles.rend();
-         ++it)
-    {
-        --i;            // array index is zero based, decrement with every loop since we iterate backwards
-        LockHandle *pHandle = *it;
-        if (pHandle)
-        {
-            if (pHandle->isWriteLockOnCurrentThread())
-            {
-                m->acUnlockedInLeave[i] = pHandle->writeLockLevel();
-                AssertMsg(m->acUnlockedInLeave[i] >= 1, ("m->cUnlockedInLeave[%d] is %d, must be >=1!", i, m->acUnlockedInLeave[i]));
-
-                for (uint32_t left = m->acUnlockedInLeave[i];
-                     left;
-                     --left)
-                    callUnlockImpl(*pHandle);
-            }
-        }
-        ++i;
-    }
-}
-
-/**
  * Same as #enter() but checks if the current thread actally owns the lock
  * and only proceeds if not. As a result, as opposed to #enter(), doesn't