儲存庫 vbox 的更動 18283

時間撮記:

2009-3-25 下午09:26:21 (16 年 以前)

作者:

vboxsync

訊息:

OVF: make import and export cancellable

檔案:

• trunk/src/VBox/Main/ApplianceImpl.cpp (修改) (15 筆差異)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1715 +1715 @@
                                                  pAppliance->m->ulWeightPerOperation);
 
-            /* How many sub notifications are necessary? */
-            const float opCountMax = 100.0/5;
-            uint32_t opCount = 0;
-
             /* Guest OS type */
             std::list<VirtualSystemDescriptionEntry*> vsdeOS;
@@ -1754 +1750 @@
 
             if (!task->progress.isNull())
-                rc = task->progress->setCurrentOperationProgress((uint32_t)(opCountMax * opCount++));
+                rc = task->progress->setCurrentOperationProgress(20);       // let's say 1/5 of the XML is done here
 
             /* CPU count (ignored for now) */
@@ -1778 +1774 @@
 
             if (!task->progress.isNull())
-                task->progress->setCurrentOperationProgress((uint32_t)(opCountMax * opCount++));
+                rc = task->progress->setCurrentOperationProgress(40);       // let's say 2/5 of the XML is done here
 
             /* Audio Adapter */
@@ -1814 +1810 @@
 
             if (!task->progress.isNull())
-                task->progress->setCurrentOperationProgress((uint32_t)(opCountMax * opCount++));
+                rc = task->progress->setCurrentOperationProgress(60);       // let's say 3/5 of the XML is done here
 
             /* Change the network adapters */
@@ -1927 +1923 @@
 
             if (!task->progress.isNull())
-                task->progress->setCurrentOperationProgress((uint32_t)(opCountMax * opCount++));
+                rc = task->progress->setCurrentOperationProgress(80);       // let's say 4/5 of the XML is done here
 
             /* CDROM drive */
@@ -2013 +2009 @@
 
             if (!task->progress.isNull())
-                task->progress->setCurrentOperationProgress((uint32_t)(opCountMax * opCount++));
+                rc = task->progress->setCurrentOperationProgress(90);
 
             // store new machine for roll-back in case of errors
@@ -2078 +2074 @@
                             throw rc;
 
-                        ComPtr<IProgress> progress;
+                        // subprogress object for hard disk
+                        ComPtr<IProgress> pProgress2;
 
                         ComPtr<IHardDisk> dstHdVBox;
@@ -2094 +2091 @@
 
                             /* Create a dynamic growing disk image with the given capacity */
-                            rc = dstHdVBox->CreateBaseStorage(di.iCapacity / _1M, HardDiskVariant_Standard, progress.asOutParam());
+                            rc = dstHdVBox->CreateBaseStorage(di.iCapacity / _1M, HardDiskVariant_Standard, pProgress2.asOutParam());
                             if (FAILED(rc)) throw rc;
 
@@ -2132 +2129 @@
                             if (FAILED(rc)) throw rc;
                             /* Clone the source disk image */
-                            rc = srcHdVBox->CloneTo(dstHdVBox, HardDiskVariant_Standard, progress.asOutParam());
+                            rc = srcHdVBox->CloneTo(dstHdVBox, HardDiskVariant_Standard, pProgress2.asOutParam());
                             if (FAILED(rc)) throw rc;
 
@@ -2141 +2138 @@
                         }
 
-                        // now loop until the asynchronous operation completes and then
-                        // report its result
+                        // now loop until the asynchronous operation completes and then report its result
                         BOOL fCompleted;
+                        BOOL fCanceled;
                         ULONG currentPercent;
-                        while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
+                        while (SUCCEEDED(pProgress2->COMGETTER(Completed(&fCompleted))))
                         {
-                            rc = progress->COMGETTER(Percent(&currentPercent));
+                            rc = task->progress->COMGETTER(Canceled)(&fCanceled);
                             if (FAILED(rc)) throw rc;
-                            if (!task->progress.isNull())
-                                task->progress->setCurrentOperationProgress(currentPercent);
-                            if (fCompleted)
-                                break;
+                            if (fCanceled)
+                                pProgress2->Cancel();
+                            else
+                            {
+                                rc = pProgress2->COMGETTER(Percent(&currentPercent));
+                                if (FAILED(rc)) throw rc;
+                                if (!task->progress.isNull())
+                                    task->progress->setCurrentOperationProgress(currentPercent);
+                                if (fCompleted)
+                                    break;
+                            }
                             /* Make sure the loop is not too tight */
-                            rc = progress->WaitForCompletion(100);
+                            rc = pProgress2->WaitForCompletion(100);
                             if (FAILED(rc)) throw rc;
                         }
                         // report result of asynchronous operation
                         HRESULT vrc;
-                        rc = progress->COMGETTER(ResultCode)(&vrc);
+                        rc = pProgress2->COMGETTER(ResultCode)(&vrc);
                         if (FAILED(rc)) throw rc;
 
@@ -2166 +2170 @@
                         if (FAILED(vrc))
                         {
-                            ProgressErrorInfo info(progress);
+                            ProgressErrorInfo info(pProgress2);
                             Utf8Str str(info.getText());
                             const char *pcsz = str.c_str();
@@ -3025 +3029 @@
                                                      pDiskEntry->ulSizeMB);     // operation's weight, as set up with the IProgress originally);
 
-                // now loop until the asynchronous operation completes and then
-                // report its result
+                // now loop until the asynchronous operation completes and then report its result
                 BOOL fCompleted;
+                BOOL fCanceled;
                 ULONG currentPercent;
                 while (SUCCEEDED(pProgress2->COMGETTER(Completed(&fCompleted))))
                 {
-                    rc = pProgress2->COMGETTER(Percent(&currentPercent));
+                    rc = task->progress->COMGETTER(Canceled)(&fCanceled);
                     if (FAILED(rc)) throw rc;
-                    if (!task->progress.isNull())
-                        task->progress->setCurrentOperationProgress(currentPercent);
-                    if (fCompleted)
-                        break;
-                    // make sure the loop is not too tight
+                    if (fCanceled)
+                        pProgress2->Cancel();
+                    else
+                    {
+                        rc = pProgress2->COMGETTER(Percent(&currentPercent));
+                        if (FAILED(rc)) throw rc;
+                        if (!task->progress.isNull())
+                            task->progress->setCurrentOperationProgress(currentPercent);
+                        if (fCompleted)
+                            break;
+                    }
+                    /* Make sure the loop is not too tight */
                     rc = pProgress2->WaitForCompletion(100);
                     if (FAILED(rc)) throw rc;
                 }
-
                 // report result of asynchronous operation
                 HRESULT vrc;
@@ -3201 +3211 @@
 
 /**
- * Calculates the no. of operations for the IProgress objects in importMachines() and write().
+ * Sets up the given progress object so that it represents disk images accurately
+ * during importMachines() and write().
+ * @param pProgress
+ * @param bstrDescription
  * @return
  */
@@ -3245 +3258 @@
     else
     {
+        // no disks to export:
         ulTotalOperationsWeight = cFixed;
         m->ulWeightPerOperation = 1;
@@ -3254 +3268 @@
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
                          bstrDescription,
-                         FALSE /* aCancelable */,
+                         TRUE /* aCancelable */,
                          cFixed + (ULONG)cDisks, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,