Changeset 25906 in vbox

Timestamp:

Jan 18, 2010 6:33:04 PM (15 years ago)

Author:

vboxsync

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

56722

Message:

Main: remove the evil Auto*Lock*::maybeEnter() function which is no longer used by the media task code now

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

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

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

@@ -624 +624 @@
 }
 
-/**
- * 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
- * assert when called with the lock already being held.
- */
-void AutoWriteLockBase::maybeEnter()
-{
-    uint32_t i = 0;
-    for (HandlesVector::iterator it = m->aHandles.begin();
-         it != m->aHandles.end();
-         ++it)
-    {
-        LockHandle *pHandle = *it;
-        if (pHandle)
-        {
-            if (!pHandle->isWriteLockOnCurrentThread())
-            {
-                for (; m->acUnlockedInLeave[i]; --m->acUnlockedInLeave[i])
-                    callLockImpl(*pHandle);
-            }
-        }
-        ++i;
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //