Changeset 37555 in vbox for trunk

Timestamp:

Jun 20, 2011 1:38:18 PM (14 years ago)

Author:

vboxsync

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

72395

Message:

Main-CloneVM: better progress weighting for diff images

File:

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

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

@@ -374 +374 @@
                     mtc.chain.append(mt);
 
+                    /* Query next parent. */
+                    rc = pSrcMedium->COMGETTER(Parent)(pSrcMedium.asOutParam());
+                    if (FAILED(rc)) throw rc;
+                };
+                /* Currently the creation of diff images involves reading at least
+                 * the biggest parent in the previous chain. So even if the new
+                 * diff image is small in size, it could need some time to create
+                 * it. Adding the biggest size in the chain should balance this a
+                 * little bit more. */
+                int64_t uMaxSize = 0;
+                for (size_t e = mtc.chain.size(); e > 0; --e)
+                {
+                    MEDIUMTASK &mt = mtc.chain.at(e - 1);
+                    /* Save the max size for better weighting of diff image
+                     * creation. */
+                    uMaxSize = RT_MAX(uMaxSize, mt.uSize);
+                    mt.uSize = (mt.uSize + uMaxSize) / 2;
+
                     /* Calculate progress data */
                     ++uCount;
-                    uTotalWeight += lSize;
-
-                    /* Query next parent. */
-                    rc = pSrcMedium->COMGETTER(Parent)(pSrcMedium.asOutParam());
-                    if (FAILED(rc)) throw rc;
-                };
+                    uTotalWeight += mt.uSize;
+                }
                 d->llMedias.append(mtc);
             }