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

Timestamp:

Apr 22, 2010 8:09:21 AM (15 years ago)

Author:

vboxsync

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

60412

Message:

Main/MediumLock: Make updating the required lock type available while locked. Simplifies use a lot and not that much more work. As a side effect minimizes the risk of losing the lock.

Location:

trunk/src/VBox/Main

Files:

• MediumLock.cpp (modified) (1 diff)
• include/MediumLock.h (modified) (2 diffs)

trunk/src/VBox/Main/MediumLock.cpp

@@ -50 +50 @@
 HRESULT MediumLock::UpdateLock(bool aLockWrite)
 {
-    if (mIsLocked)
-        return VBOX_E_INVALID_OBJECT_STATE;
+    if (aLockWrite == mLockWrite)
+        return S_OK;
+    if (mIsLocked)
+    {
+        HRESULT rc = Unlock();
+        if (FAILED(rc))
+        {
+            Lock();
+            return rc;
+        }
+        mLockWrite = aLockWrite;
+        rc = Lock();
+        if (FAILED(rc))
+        {
+            mLockWrite = !mLockWrite;
+            Lock();
+            return rc;
+        }
+        return S_OK;
+    }
+
     mLockWrite = aLockWrite;
     return S_OK;

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

@@ -74 +74 @@
 
     /**
-     * Update a medium lock description
-     *
-     * @note May be only used in unlocked state.
+     * Update a medium lock description.
+     *
+     * @note May be used in locked state.
      *
      * @return COM status code
@@ -190 +190 @@
 
     /**
-     * Clear all medium lock declaration.
+     * Clear all medium lock declarations.
      *
      * @note Implicitly unlocks all locks.