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

Timestamp:

Aug 9, 2010 9:54:17 AM (15 years ago)

Author:

vboxsync

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

64555

Message:

Main: avoid excessive copying in VirtualBox::saveSettings()

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3186 +3186 @@
     {
         // machines
-        settings::MachinesRegistry machinesTemp;
+        m->pMainConfigFile->llMachines.clear();
         {
             AutoReadLock machinesLock(m->allMachines.getLockHandle() COMMA_LOCKVAL_SRC_POS);
@@ -3197 +3197 @@
                 settings::MachineRegistryEntry mre;
                 rc = pMachine->saveRegistryEntry(mre);
-                machinesTemp.push_back(mre);
+                m->pMainConfigFile->llMachines.push_back(mre);
             }
         }
@@ -3237 +3237 @@
 
         // hard disks
-        settings::MediaList hardDisksTemp;
+        m->pMainConfigFile->mediaRegistry.llHardDisks.clear();
         for (MediaList::const_iterator it = m->allHardDisks.begin();
              it != m->allHardDisks.end();
@@ -3245 +3245 @@
             rc = (*it)->saveSettings(med);     // this recurses into its children
             if (FAILED(rc)) throw rc;
-            hardDisksTemp.push_back(med);
+            m->pMainConfigFile->mediaRegistry.llHardDisks.push_back(med);
         }
 
         /* CD/DVD images */
-        settings::MediaList dvdsTemp;
+        m->pMainConfigFile->mediaRegistry.llDvdImages.clear();
         for (MediaList::const_iterator it = m->allDVDImages.begin();
              it != m->allDVDImages.end();
@@ -3257 +3257 @@
             rc = (*it)->saveSettings(med);
             if (FAILED(rc)) throw rc;
-            dvdsTemp.push_back(med);
+            m->pMainConfigFile->mediaRegistry.llDvdImages.push_back(med);
         }
 
         /* floppy images */
-        settings::MediaList floppiesTemp;
+        m->pMainConfigFile->mediaRegistry.llFloppyImages.clear();
         for (MediaList::const_iterator it = m->allFloppyImages.begin();
              it != m->allFloppyImages.end();
@@ -3269 +3269 @@
             rc = (*it)->saveSettings(med);
             if (FAILED(rc)) throw rc;
-            floppiesTemp.push_back(med);
+            m->pMainConfigFile->mediaRegistry.llFloppyImages.push_back(med);
         }
 
         mediaLock.release();
 
-        settings::DHCPServersList dhcpServersTemp;
+        m->pMainConfigFile->llDhcpServers.clear();
         {
             AutoReadLock dhcpLock(m->allDHCPServers.getLockHandle() COMMA_LOCKVAL_SRC_POS);
@@ -3284 +3284 @@
                 rc = (*it)->saveSettings(d);
                 if (FAILED(rc)) throw rc;
-                dhcpServersTemp.push_back(d);
+                m->pMainConfigFile->llDhcpServers.push_back(d);
             }
         }
-
-        /* now copy the temp data to the config file under the VirtualBox lock */
-        m->pMainConfigFile->llMachines = machinesTemp;
-        m->pMainConfigFile->mediaRegistry.llHardDisks = hardDisksTemp;
-        m->pMainConfigFile->mediaRegistry.llDvdImages = dvdsTemp;
-        m->pMainConfigFile->mediaRegistry.llFloppyImages = floppiesTemp;
-        m->pMainConfigFile->llDhcpServers = dhcpServersTemp;
 
         // leave extra data alone, it's still in the config file