Changeset 30313 in vbox

Timestamp:

Jun 18, 2010 1:20:34 PM (14 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD: optimize image cloning, at the moment only for newly created target images without parents

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -534 +534 @@
  */
 static int vdReadHelper(PVBOXHDD pDisk, PVDIMAGE pImage, PVDIMAGE pImageParentOverride,
-                        uint64_t uOffset, void *pvBuf, size_t cbRead)
+                        uint64_t uOffset, void *pvBuf, size_t cbRead, bool fHandleFreeBlocks)
 {
     int rc;
     size_t cbThisRead;
+    bool fAllFree = true;
+    size_t cbBufClear = 0;
 
     /* Loop until all read. */
@@ -570 +572 @@
         if (rc == VERR_VD_BLOCK_FREE)
         {
-            memset(pvBuf, '\0', cbThisRead);
+            /* Fill the free space with 0 if we are told to do so. */
+            if (fHandleFreeBlocks)
+                memset(pvBuf, '\0', cbThisRead);
+            else
+                cbBufClear += cbThisRead;
+
             rc = VINF_SUCCESS;
+        }
+        else if (RT_SUCCESS(rc))
+        {
+            /* First not free block, fill the space before with 0. */
+            if (!fHandleFreeBlocks)
+            {
+                memset((char *)pvBuf - cbBufClear, '\0', cbBufClear);
+                cbBufClear = 0;
+                fAllFree = false;
+            }
         }
 
@@ -579 +596 @@
     } while (cbRead != 0 && RT_SUCCESS(rc));
 
-    return rc;
+    return (!fHandleFreeBlocks && fAllFree) ? VERR_VD_BLOCK_FREE : rc;
 }
 
@@ -891 +908 @@
     PVDPARENTSTATEDESC pParentState = (PVDPARENTSTATEDESC)pvUser;
     return vdReadHelper(pParentState->pDisk, pParentState->pImage, NULL, uOffset,
-                        pvBuf, cbRead);
+                        pvBuf, cbRead, true);
 }
 
@@ -952 +969 @@
     {
         rc = vdReadHelper(pDisk, pImage, pImageParentOverride,
-                          uOffset - cbPreRead, pvTmp, cbPreRead);
+                          uOffset - cbPreRead, pvTmp, cbPreRead, true);
         if (RT_FAILURE(rc))
             return rc;
@@ -989 +1006 @@
                               uOffset + cbThisWrite + cbWriteCopy,
                               (char *)pvTmp + cbPreRead + cbThisWrite + cbWriteCopy,
-                              cbReadImage);
+                              cbReadImage, true);
         if (RT_FAILURE(rc))
             return rc;
@@ -1049 +1066 @@
      * be modified by the write or not. */
     rc = vdReadHelper(pDisk, pImage, pImageParentOverride, uOffset - cbPreRead, pvTmp,
-                      cbPreRead + cbThisWrite + cbPostRead - cbFill);
+                      cbPreRead + cbThisWrite + cbPostRead - cbFill, true);
     if (RT_FAILURE(rc))
         return rc;
@@ -4076 +4093 @@
         }
 
+        /* Whether we can take the optimized copy path (false) or not.
+         * Don't optimize if the image existed or if it is a child image. */
+        bool fRegularRead = (pszFilename == NULL) || (cImagesTo > 0);
+
         /* Copy the data. */
         uint64_t uOffset = 0;
@@ -4094 +4115 @@
 
             rc = vdReadHelper(pDiskFrom, pImageFrom, NULL, uOffset, pvBuf,
-                              cbThisRead);
-            if (RT_FAILURE(rc))
+                              cbThisRead, fRegularRead);
+            if (RT_FAILURE(rc) && rc != VERR_VD_BLOCK_FREE)
                 break;
 
@@ -4102 +4123 @@
             fLockReadFrom = false;
 
-            rc2 = vdThreadStartWrite(pDiskTo);
-            AssertRC(rc2);
-            fLockWriteTo = true;
-
-            rc = vdWriteHelper(pDiskTo, pImageTo, NULL, uOffset, pvBuf,
-                               cbThisRead);
-            if (RT_FAILURE(rc))
-                break;
-
-            rc2 = vdThreadFinishWrite(pDiskTo);
-            AssertRC(rc2);
-            fLockWriteTo = false;
+            if (rc != VERR_VD_BLOCK_FREE)
+            {
+                rc2 = vdThreadStartWrite(pDiskTo);
+                AssertRC(rc2);
+                fLockWriteTo = true;
+
+                rc = vdWriteHelper(pDiskTo, pImageTo, NULL, uOffset, pvBuf,
+                                   cbThisRead);
+                if (RT_FAILURE(rc))
+                    break;
+
+                rc2 = vdThreadFinishWrite(pDiskTo);
+                AssertRC(rc2);
+                fLockWriteTo = false;
+            }
 
             uOffset += cbThisRead;
@@ -4531 +4555 @@
         AssertPtrBreakStmt(pImage, rc = VERR_VD_NOT_OPENED);
 
-        rc = vdReadHelper(pDisk, pImage, NULL, uOffset, pvBuf, cbRead);
+        rc = vdReadHelper(pDisk, pImage, NULL, uOffset, pvBuf, cbRead, true);
     } while (0);