Changeset 15318 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 11, 2008 5:27:02 PM (16 years ago)

Author:

vboxsync

Message:

Main: Fixed a deadlock in VBoxSVC when attaching a hard disk indirectly, through creating a new diff for it.

Location:

trunk/src/VBox/Main/include

Files:

• HardDisk2Impl.h (modified) (1 diff)
• VirtualBoxImpl.h (modified) (3 diffs)

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

@@ -224 +224 @@
      *    object lock.
      */
-    RWLockHandle *treeLock() { return mVirtualBox->hardDiskTreeHandle(); }
+    RWLockHandle *treeLock() { return mVirtualBox->hardDiskTreeLockHandle(); }
 
     /** Reimplements VirtualBoxWithTypedChildren::childrenLock() to return

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

@@ -362 +362 @@
      *    object lock.
      */
-    RWLockHandle *hardDiskTreeHandle() { return &mHardDiskTreeHandle; }
+    RWLockHandle *hardDiskTreeLockHandle() { return &mHardDiskTreeLockHandle; }
 
     /* for VirtualBoxSupportErrorInfoImpl */
@@ -380 +380 @@
 
     typedef std::map <Guid, ComObjPtr <HardDisk2> > HardDisk2Map;
+
+    /**
+     * Reimplements VirtualBoxWithTypedChildren::childrenLock() to return a
+     * dedicated lock instead of the main object lock. The dedicated lock for
+     * child map operations frees callers of init() methods of these children
+     * from acquiring a write parent (VirtualBox) lock (which would be mandatory
+     * otherwise). Since VirtualBox has a lot of heterogenous children which
+     * init() methods are called here and there, it definitely makes sense.
+     */
+    RWLockHandle *childrenLock() { return &mChildrenMapLockHandle; }
 
     HRESULT checkMediaForConflicts2 (const Guid &aId, const Bstr &aLocation,
@@ -490 +500 @@
     RWLockHandle mSafeLock;
 
-    RWLockHandle mHardDiskTreeHandle;
+    RWLockHandle mHardDiskTreeLockHandle;
+    RWLockHandle mChildrenMapLockHandle;
 
     static Bstr sVersion;