Changeset 16309 in vbox

Timestamp:

Jan 28, 2009 1:42:36 PM (16 years ago)

Author:

vboxsync

Message:

OVF: avoid excessive string/list copying

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (14 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/ApplianceImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1375 +1375 @@
 
         /* Guest OS type */
-        list<VirtualSystemDescriptionEntry> vsdeOS = vsd->findByType(VirtualSystemDescriptionType_OS);
+        std::list<VirtualSystemDescriptionEntry*> vsdeOS = vsd->findByType(VirtualSystemDescriptionType_OS);
         Assert(vsdeOS.size() == 1);
-        string osTypeVBox = vsdeOS.front().strFinalValue;
+        string osTypeVBox = vsdeOS.front()->strFinalValue;
 
         /* Now that we know the base system get our internal defaults based on that. */
@@ -1386 +1386 @@
         /* Create the machine */
         /* First get the name */
-        list<VirtualSystemDescriptionEntry> vsdeName = vsd->findByType(VirtualSystemDescriptionType_Name);
+        std::list<VirtualSystemDescriptionEntry*> vsdeName = vsd->findByType(VirtualSystemDescriptionType_Name);
         Assert(vsdeName.size() == 1);
-        string nameVBox = vsdeName.front().strFinalValue;
+        string nameVBox = vsdeName.front()->strFinalValue;
         ComPtr<IMachine> newMachine;
         rc = mVirtualBox->CreateMachine(Bstr(nameVBox.c_str()), Bstr(osTypeVBox.c_str()),
@@ -1397 +1397 @@
         /* CPU count (ignored for now) */
         /* @todo: check min/max requirements of VBox (SchemaDefs::Min/MaxCPUCount) */
-        // list<VirtualSystemDescriptionEntry> vsdeCPU = vsd->findByType (VirtualSystemDescriptionType_CPU);
+        // EntriesList vsdeCPU = vsd->findByType (VirtualSystemDescriptionType_CPU);
 
         /* RAM */
         /* @todo: check min/max requirements of VBox (SchemaDefs::Min/MaxGuestRAM) */
-        list<VirtualSystemDescriptionEntry> vsdeRAM = vsd->findByType(VirtualSystemDescriptionType_Memory);
+        std::list<VirtualSystemDescriptionEntry*> vsdeRAM = vsd->findByType(VirtualSystemDescriptionType_Memory);
         Assert(vsdeRAM.size() == 1);
-        string memoryVBox = vsdeRAM.front().strFinalValue;
+        string memoryVBox = vsdeRAM.front()->strFinalValue;
         uint64_t tt = RTStrToUInt64(memoryVBox.c_str()) / _1M;
 
@@ -1420 +1420 @@
 
         /* Change the network adapters */
-        list<VirtualSystemDescriptionEntry> vsdeNW = vsd->findByType(VirtualSystemDescriptionType_NetworkAdapter);
+        std::list<VirtualSystemDescriptionEntry*> vsdeNW = vsd->findByType(VirtualSystemDescriptionType_NetworkAdapter);
         if (vsdeNW.size() == 0)
         {
@@ -1432 +1432 @@
         else
         {
-            list<VirtualSystemDescriptionEntry>::const_iterator nwIt;
+            list<VirtualSystemDescriptionEntry*>::const_iterator nwIt;
             /* Iterate through all network cards. We support 8 network adapters
              * at the maximum. (@todo: warn if it are more!) */
@@ -1440 +1440 @@
                  ++nwIt, ++a)
             {
-                string nwTypeVBox = nwIt->strFinalValue;
+                string nwTypeVBox = (*nwIt)->strFinalValue;
                 uint32_t tt1 = RTStrToUInt32(nwTypeVBox.c_str());
                 ComPtr<INetworkAdapter> nwVBox;
@@ -1455 +1455 @@
 
         /* Hard disk controller IDE */
-        list<VirtualSystemDescriptionEntry> vsdeHDCIDE = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerIDE);
+        std::list<VirtualSystemDescriptionEntry*> vsdeHDCIDE = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerIDE);
         /* @todo: we support one IDE controller only */
         if (vsdeHDCIDE.size() > 0)
         {
-             IDEControllerType_T hdcVBox = static_cast<IDEControllerType_T>(RTStrToUInt32(vsdeHDCIDE.front().strFinalValue.c_str()));
+             IDEControllerType_T hdcVBox = static_cast<IDEControllerType_T>(RTStrToUInt32(vsdeHDCIDE.front()->strFinalValue.c_str()));
              /* Set the appropriate IDE controller in the virtual BIOS of the
               * VM. */
@@ -1470 +1470 @@
 #ifdef VBOX_WITH_AHCI
         /* Hard disk controller SATA */
-        list<VirtualSystemDescriptionEntry> vsdeHDCSATA = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerSATA);
+        std::list<VirtualSystemDescriptionEntry*> vsdeHDCSATA = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerSATA);
         /* @todo: we support one SATA controller only */
         if (vsdeHDCSATA.size() > 0)
         {
-            string hdcVBox = vsdeHDCIDE.front().strFinalValue;
+            string hdcVBox = vsdeHDCIDE.front()->strFinalValue;
             if (!RTStrCmp(hdcVBox.c_str(), "AHCI"))
             {
@@ -1492 +1492 @@
 #ifdef VBOX_WITH_SCSI
         /* Hard disk controller SCSI */
-        list<VirtualSystemDescriptionEntry> vsdeHDCSCSI = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
+        EntriesList vsdeHDCSCSI = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
         /* @todo: do we support more than one SCSI controller? */
         if (vsdeHDCSCSI.size() > 0)
@@ -1506 +1506 @@
 
         /* Create the hard disks & connect them to the appropriate controllers. */
-        list<VirtualSystemDescriptionEntry> vsdeHD = vsd->findByType(VirtualSystemDescriptionType_HardDiskImage);
+        std::list<VirtualSystemDescriptionEntry*> vsdeHD = vsd->findByType(VirtualSystemDescriptionType_HardDiskImage);
         if (vsdeHD.size() > 0)
         {
@@ -1526 +1526 @@
             RTPathStripFilename(srcDir);
             /* Iterate over all given disk images */
-            list<VirtualSystemDescriptionEntry>::const_iterator hdIt;
+            list<VirtualSystemDescriptionEntry*>::const_iterator hdIt;
             for (hdIt = vsdeHD.begin();
                  hdIt != vsdeHD.end();
                  ++hdIt)
             {
-                char *dstFilePath = RTStrDup(hdIt->strFinalValue.c_str());
+                char *dstFilePath = RTStrDup((*hdIt)->strFinalValue.c_str());
                 /* Check if the destination file exists already or the
                  * destination path is empty. */
@@ -1541 +1541 @@
 //                    continue;
                 }
+                const string &strRef = (*hdIt)->strRef;
                 /* Get the associated disk image */
-                if (m->mapDisks.find(hdIt->strRef) == m->mapDisks.end())
+                if (m->mapDisks.find(strRef) == m->mapDisks.end())
                 {
                     /* @todo: error: entry doesn't exists */
                 }
-                DiskImage di = m->mapDisks [hdIt->strRef];
+                DiskImage di = m->mapDisks [strRef];
                 /* Construct the source file path */
                 char *srcFilePath;
@@ -1768 +1769 @@
 }
 
-void VirtualSystemDescription::addEntry(VirtualSystemDescriptionType_T aType, std::string aRef, std::string aOrigValue, std::string aAutoValue, std::string aConfig /* = "" */)
+void VirtualSystemDescription::addEntry(VirtualSystemDescriptionType_T aType,
+                                        const std::string &aRef,
+                                        const std::string &aOrigValue,
+                                        const std::string &aAutoValue,
+                                        const std::string &aConfig /* = "" */)
 {
     VirtualSystemDescriptionEntry vsde;
@@ -1782 +1787 @@
 }
 
-list<VirtualSystemDescriptionEntry> VirtualSystemDescription::findByType(VirtualSystemDescriptionType_T aType)
-{
-    list<VirtualSystemDescriptionEntry> vsd;
-
-    list<VirtualSystemDescriptionEntry>::const_iterator it;
+std::list<VirtualSystemDescriptionEntry*> VirtualSystemDescription::findByType(VirtualSystemDescriptionType_T aType)
+{
+    std::list<VirtualSystemDescriptionEntry*> vsd;
+    list<VirtualSystemDescriptionEntry>::iterator it;
     for (it = m->descriptions.begin();
          it != m->descriptions.end();
          ++it)
         if (it->type == aType)
-            vsd.push_back(*it);
+            vsd.push_back(&(*it));
 
     return vsd;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3002 +3002 @@
     <const name="NetworkAdapter" value="11" />
     <const name="USBController" value="12" />
+    <const name="SoundCard" value="13" />
 
   </enum>

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

@@ -150 +150 @@
     /* private instance data */
 private:
-    void addEntry(VirtualSystemDescriptionType_T aType, std::string aRef, std::string aOrigValue, std::string aAutoValue, std::string aConfig = "");
-    std::list<VirtualSystemDescriptionEntry> findByType(VirtualSystemDescriptionType_T aType);
+    void addEntry(VirtualSystemDescriptionType_T aType,
+                  const std::string &aRef,
+                  const std::string &aOrigValue,
+                  const std::string &aAutoValue,
+                  const std::string &aConfig = "");
+
+    std::list<VirtualSystemDescriptionEntry*> findByType(VirtualSystemDescriptionType_T aType);
 
     struct Data;