Changeset 43479 in vbox for trunk/src/VBox

Timestamp:

Oct 1, 2012 9:07:25 AM (12 years ago)

Author:

vboxsync

Message:

Main/VirtualBox: properly lock objects when saving the media registry, and handle inaccessible objects.

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -4571 +4571 @@
     uint64_t uOld;
 
-    for (MachinesOList::iterator it = m->allMachines.begin();
-         it != m->allMachines.end();
-         ++it)
-    {
-        const ComObjPtr<Machine> &pMachine = *it;
-
-        for (;;)
-        {
-            uOld = ASMAtomicReadU64(&pMachine->uRegistryNeedsSaving);
-            if (!uOld)
-                break;
-            if (ASMAtomicCmpXchgU64(&pMachine->uRegistryNeedsSaving, 0, uOld))
-                break;
-            ASMNopPause();
-        }
-        if (uOld)
-        {
-            AutoCaller autoCaller(pMachine);
-            if (FAILED(autoCaller.rc()))
-                continue;
-            /* object is already dead, no point in saving settings */
-            if (autoCaller.state() != Ready)
-                continue;
-            AutoWriteLock mlock(pMachine COMMA_LOCKVAL_SRC_POS);
-            rc = pMachine->saveSettings(&fNeedsGlobalSettings,
-                                        Machine::SaveS_Force);           // caller said save, so stop arguing
+    {
+        AutoReadLock alock(m->allMachines.getLockHandle() COMMA_LOCKVAL_SRC_POS);
+        for (MachinesOList::iterator it = m->allMachines.begin();
+             it != m->allMachines.end();
+             ++it)
+        {
+            const ComObjPtr<Machine> &pMachine = *it;
+
+            for (;;)
+            {
+                uOld = ASMAtomicReadU64(&pMachine->uRegistryNeedsSaving);
+                if (!uOld)
+                    break;
+                if (ASMAtomicCmpXchgU64(&pMachine->uRegistryNeedsSaving, 0, uOld))
+                    break;
+                ASMNopPause();
+            }
+            if (uOld)
+            {
+                AutoCaller autoCaller(pMachine);
+                if (FAILED(autoCaller.rc()))
+                    continue;
+                /* object is already dead, no point in saving settings */
+                if (autoCaller.state() != Ready)
+                    continue;
+                AutoWriteLock mlock(pMachine COMMA_LOCKVAL_SRC_POS);
+                rc = pMachine->saveSettings(&fNeedsGlobalSettings,
+                                            Machine::SaveS_Force);           // caller said save, so stop arguing
+            }
         }
     }