Changeset 59758 in vbox

Timestamp:

Feb 20, 2016 3:02:15 AM (9 years ago)

Author:

vboxsync

Message:

ApplianceImplImport.cpp: Inserted read ahead threads into the source I/O streams for all image operations.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (5 diffs)

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

@@ -1001 +1001 @@
 {
     /*
-     * Just open the file (throws error) and write the destination (nothrow).
+     * Open the file (throws error) and add a read ahead thread so we can do
+     * concurrent reads (+digest) and writes.
      */
     RTVFSIOSTREAM hVfsIosSrc = i_importOpenSourceFile(stack, rstrSrcPath, pszManifestEntry);
-    HRESULT hrc = i_importCreateAndWriteDestinationFile(rstrDstPath, hVfsIosSrc, rstrSrcPath);
+    RTVFSIOSTREAM hVfsIosReadAhead;
+    int vrc = RTVfsCreateReadAheadForIoStream(hVfsIosSrc, 0 /*fFlags*/, 0 /*cBuffers=default*/, 0 /*cbBuffers=default*/,
+                                              &hVfsIosReadAhead);
+    if (RT_FAILURE(vrc))
+    {
+        RTVfsIoStrmRelease(hVfsIosSrc);
+        throw setErrorVrc(vrc, tr("Error initializing read ahead thread for '%s' (%Rrc)"), rstrSrcPath.c_str(), vrc);
+    }
+
+    /*
+     * Write the destination file (nothrow).
+     */
+    HRESULT hrc = i_importCreateAndWriteDestinationFile(rstrDstPath, hVfsIosReadAhead, rstrSrcPath);
+    RTVfsIoStrmRelease(hVfsIosReadAhead);
 
     /*
@@ -1040 +1054 @@
      * is done on one thread, while unpacking and writing is one on this thread.
      */
-    /** @todo read thread */
+    RTVFSIOSTREAM hVfsIosReadAhead;
+    int vrc = RTVfsCreateReadAheadForIoStream(hVfsIosSrcCompressed, 0 /*fFlags*/, 0 /*cBuffers=default*/,
+                                              0 /*cbBuffers=default*/, &hVfsIosReadAhead);
+    if (RT_FAILURE(vrc))
+    {
+        RTVfsIoStrmRelease(hVfsIosSrcCompressed);
+        throw setErrorVrc(vrc, tr("Error initializing read ahead thread for '%s' (%Rrc)"), rstrSrcPath.c_str(), vrc);
+    }
 
     /*
@@ -1046 +1067 @@
      */
     RTVFSIOSTREAM hVfsIosSrc;
-    int vrc = RTZipGzipDecompressIoStream(hVfsIosSrcCompressed, 0, &hVfsIosSrc);
+    vrc = RTZipGzipDecompressIoStream(hVfsIosReadAhead, 0, &hVfsIosSrc);
+    RTVfsIoStrmRelease(hVfsIosReadAhead);
     if (RT_FAILURE(vrc))
     {
@@ -2581 +2603 @@
                         hVfsIosSrc = i_importOpenSourceFile(stack, strSrcFilePath, strSourceOVF.c_str());
 
+                    /* Add a read ahead thread to try speed things up with concurrent reads and
+                       writes going on in different threads. */
+                    RTVFSIOSTREAM hVfsIosReadAhead;
+                    vrc = RTVfsCreateReadAheadForIoStream(hVfsIosSrc, 0 /*fFlags*/, 0 /*cBuffers=default*/,
+                                                          0 /*cbBuffers=default*/, &hVfsIosReadAhead);
+                    RTVfsIoStrmRelease(hVfsIosSrc);
+                    if (RT_FAILURE(vrc))
+                        throw setErrorVrc(vrc, tr("Error initializing read ahead thread for '%s' (%Rrc)"),
+                                          strSrcFilePath.c_str(), vrc);
+
                     /* Start the source image cloning operation. */
                     ComObjPtr<Medium> nullParent;
@@ -2586 +2618 @@
                                                  srcFormat,
                                                  MediumVariant_Standard,
-                                                 hVfsIosSrc,
+                                                 hVfsIosReadAhead,
                                                  nullParent,
                                                  pProgress);
-                    RTVfsIoStrmRelease(hVfsIosSrc);
+                    RTVfsIoStrmRelease(hVfsIosReadAhead);
                     hVfsIosSrc = NIL_RTVFSIOSTREAM;
                     if (FAILED(rc))