Changeset 67231 in vbox for trunk

Timestamp:

Jun 2, 2017 11:20:54 AM (8 years ago)

Author:

vboxsync

Message:

Main/ApplianceExport/Medium: Added progress to i_addRawToFss.

Location:

trunk/src/VBox/Main

Files:

• include/MediumImpl.h (modified) (1 diff)
• src-server/ApplianceImplExport.cpp (modified) (3 diffs)
• src-server/MediumImpl.cpp (modified) (2 diffs)

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

@@ -203 +203 @@
     HRESULT i_fixParentUuidOfChildren(MediumLockList *pChildrenToReparent);
 
-    HRESULT i_addRawToFss(const char *aFilename, SecretKeyStore *pKeyStore,
-                          RTVFSFSSTREAM hVfsFssDst /*, const ComObjPtr<Progress> &aProgress*/);
+    HRESULT i_addRawToFss(const char *aFilename, SecretKeyStore *pKeyStore, RTVFSFSSTREAM hVfsFssDst,
+                          const ComObjPtr<Progress> &aProgress, bool fSparse);
 
     HRESULT i_exportFile(const char *aFilename,

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

@@ -2333 +2333 @@
                                                    pDiskEntry->ulSizeMB);     // operation's weight, as set up
                                                                               // with the IProgress originally
-                hrc = ptrSourceDisk->i_addRawToFss(strInsideName.c_str(), m->m_pSecretKeyStore, hVfsFssTar /*, pProgress2*/);
+                hrc = ptrSourceDisk->i_addRawToFss(strInsideName.c_str(), m->m_pSecretKeyStore, hVfsFssTar,
+                                                   pTask->pProgress, true /*fSparse*/);
                 if (FAILED(hrc))
                     throw hrc;
@@ -2538 +2539 @@
                      * Export a disk image.
                      */
+                    /** @todo this progress object needs to be hooked up to pTask->pProgress... */
                     ComObjPtr<Progress> pProgress2;
                     pProgress2.createObject();
@@ -2588 +2590 @@
 
 #ifdef VBOX_WITH_NEW_TAR_CREATOR
-                    rc = pSourceDisk->i_addRawToFss(strTargetFilePath.c_str(), m->m_pSecretKeyStore, hVfsFssDst /*, pProgress2*/);
+                    rc = pSourceDisk->i_addRawToFss(strTargetFilePath.c_str(), m->m_pSecretKeyStore, hVfsFssDst,
+                                                    pTask->pProgress, false /*fSparse*/);
                     if (FAILED(rc)) throw rc;
 #else

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

@@ -6107 +6107 @@
  * @note    Similar code exists in i_taskExportHandler.
  */
-HRESULT Medium::i_addRawToFss(const char *aFilename, SecretKeyStore *pKeyStore,
-                              RTVFSFSSTREAM hVfsFssDst /*, const ComObjPtr<Progress> &aProgress*/)
+HRESULT Medium::i_addRawToFss(const char *aFilename, SecretKeyStore *pKeyStore, RTVFSFSSTREAM hVfsFssDst,
+                              const ComObjPtr<Progress> &aProgress, bool fSparse)
 {
      /** @todo fix progress object. */
@@ -6235 +6235 @@
 
             /*
-             * Create a VFS file interface to the HDD.
+             * Create a VFS file interface to the HDD and attach a progress wrapper
+             * that monitors the progress reading of the raw image.  The image will
+             * be read twice if hVfsFssDst does sparse processing.
              */
-            RTVFSFILE hVfsFile = NIL_RTVFSFILE;
-            vrc = VDCreateVfsFileFromDisk(hdd, 0 /*fFlags*/, &hVfsFile);
+            RTVFSFILE hVfsFileDisk = NIL_RTVFSFILE;
+            vrc = VDCreateVfsFileFromDisk(hdd, 0 /*fFlags*/, &hVfsFileDisk);
             if (RT_SUCCESS(vrc))
             {
-                RTVFSOBJ hVfsObj = RTVfsObjFromFile(hVfsFile);
-                RTVfsFileRelease(hVfsFile);
-                vrc = RTVfsFsStrmAdd(hVfsFssDst, aFilename, hVfsObj, 0 /*fFlags*/);
-                RTVfsObjRelease(hVfsObj);
-                if (RT_FAILURE(vrc))
-                    rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Failed to add '%s' to output (%Rrc)"), aFilename, vrc);
+                RTVFSFILE hVfsFileProgress = NIL_RTVFSFILE;
+                vrc = RTVfsCreateProgressForFile(hVfsFileDisk, aProgress->i_iprtProgressCallback, &*aProgress,
+                                                 RTVFSPROGRESS_F_CANCELABLE | RTVFSPROGRESS_F_FORWARD_SEEK_AS_READ,
+                                                 VDGetSize(hdd, VD_LAST_IMAGE) * (fSparse ? 2 : 1) /*cbExpectedRead*/,
+                                                 0 /*cbExpectedWritten*/, &hVfsFileProgress);
+                RTVfsFileRelease(hVfsFileDisk);
+                if (RT_SUCCESS(rc))
+                {
+                    RTVFSOBJ hVfsObj = RTVfsObjFromFile(hVfsFileProgress);
+                    RTVfsFileRelease(hVfsFileProgress);
+
+                    vrc = RTVfsFsStrmAdd(hVfsFssDst, aFilename, hVfsObj, 0 /*fFlags*/);
+                    RTVfsObjRelease(hVfsObj);
+                    if (RT_FAILURE(vrc))
+                        rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Failed to add '%s' to output (%Rrc)"), aFilename, vrc);
+
+                }
+                else
+                    rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                      tr("RTVfsCreateProgressForFile failed when processing '%s' (%Rrc)"), aFilename, vrc);
             }
             else