Changeset 33060 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Oct 12, 2010 12:17:49 PM (14 years ago)

Author:

vboxsync

Message:

Main;OVF/OVA: online calculation of the SHA1 sum; directly stream into the ova (no temporary files anymore); cache writing

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -678 +678 @@
             break;
         }
-        /* Check if the current operation have changed. It is also possible
+        /* Check if the current operation has changed. It is also possible
            that in the meantime more than one async operation was finished. So
            we have to loop as long as we reached the same operation count. */
@@ -843 +843 @@
         case WriteFile:
         {
-            // assume that creating the manifest will take 10% of the time it takes to export the disks
+            // assume that creating the manifest will take .1% of the time it takes to export the disks
             if (m->fManifest)
             {
                 ++cOperations;          // another one for creating the manifest
 
-                m->ulWeightForManifestOperation = m->ulTotalDisksMB / 10;
+                m->ulWeightForManifestOperation = (ULONG)((double)m->ulTotalDisksMB * .1 / 100);    // use .5% of the progress for the manifest
                 ulTotalOperationsWeight += m->ulWeightForManifestOperation;
-            }
-            if (fOVA)
-            {
-                // Another operation for packing
-                ++cOperations;
-
-                // assume that packing the files into the archive has the same weight than creating all files in the ovf exporting step
-                ulTotalOperationsWeight += m->ulTotalDisksMB;
             }
             break;