Changeset 27137 in vbox for trunk/src/VBox/Devices/Storage/testcase/tstVDSnap.cpp

Timestamp:

Mar 6, 2010 7:05:19 PM (15 years ago)

Author:

vboxsync

Message:

tstVDSnap: Allow unallocated blocks in the base image

File:

• trunk/src/VBox/Devices/Storage/testcase/tstVDSnap.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/testcase/tstVDSnap.cpp

@@ -58 +58 @@
     /** Chance to change a segment after a diff was created */
     uint32_t    uChangeSegChance;
+    /** Numer of allocated blocks in the base image in percent */
+    uint32_t    uAllocatedBlocks;
 } VDSNAPTEST, *PVDSNAPTEST;
 
@@ -137 +139 @@
             size_t cbWrite  = paDiskSegments[i].cbSeg;
             uint64_t off    = paDiskSegments[i].off;
-            uint8_t *pbData = fInit ? paDiskSegments[i].pbData : paDiskSegments[i].pbDataDiff;
-
-            rc = VDWrite(pVD, off, pbData, cbWrite);
-            if (RT_FAILURE(rc))
-                return rc;
+            uint8_t *pbData =   fInit
+                              ? paDiskSegments[i].pbData
+                              : paDiskSegments[i].pbDataDiff;
+
+            if (pbData)
+            {
+                rc = VDWrite(pVD, off, pbData, cbWrite);
+                if (RT_FAILURE(rc))
+                    return rc;
+            }
         }
     }
@@ -169 +176 @@
                 return rc;
 
-            if (memcmp(pbCmp, pbBuf, cbToRead))
+            if (pbCmp)
             {
+                if (memcmp(pbCmp, pbBuf, cbToRead))
+                {
+                    for (unsigned iCmp = 0; iCmp < cbToRead; iCmp++)
+                    {
+                        if (pbCmp[iCmp] != pbBuf[iCmp])
+                        {
+                            RTPrintf("Unexpected data at %llu expected %#x got %#x\n", off+iCmp, pbCmp[iCmp], pbBuf[iCmp]);
+                            break;
+                        }
+                    }
+                    return VERR_INTERNAL_ERROR;
+                }
+            }
+            else
+            {
+                /* Verify that the block is 0 */
                 for (unsigned iCmp = 0; iCmp < cbToRead; iCmp++)
                 {
-                    if (pbCmp[iCmp] != pbBuf[iCmp])
+                    if (pbBuf[iCmp] != 0)
                     {
-                        RTPrintf("Unexpected data at %llu expected %#x got %#x\n", off+i, pbCmp[iCmp], pbBuf[iCmp]);
-                        break;
+                        RTPrintf("Zero block contains data at %llu\n", off+iCmp);
+                        return VERR_INTERNAL_ERROR;
                     }
                 }
-                return VERR_INTERNAL_ERROR;
             }
 
             cbRead -= cbToRead;
             off    += cbToRead;
-            pbCmp  += cbToRead;
+
+            if (pbCmp)
+                pbCmp  += cbToRead;
         }
     }
@@ -225 +249 @@
         paDiskSeg[i].off    = cbDisk;
         paDiskSeg[i].cbSeg  = RT_ALIGN_64(RTRandU64Ex(512, pTest->cbTestPattern), 512);
-        paDiskSeg[i].pbData = pbTestPattern + RT_ALIGN_64(RTRandU64Ex(0, pTest->cbTestPattern - paDiskSeg[i].cbSeg - 512), 512);
+        if (tstVDSnapIsTrue(pTest->uAllocatedBlocks))
+            paDiskSeg[i].pbData = pbTestPattern + RT_ALIGN_64(RTRandU64Ex(0, pTest->cbTestPattern - paDiskSeg[i].cbSeg - 512), 512);
+        else
+            paDiskSeg[i].pbData = NULL; /* Not allocated initially */
         cbDisk += paDiskSeg[i].cbSeg;
     }
@@ -371 +398 @@
     Test.uCreateDiffChance    = 50; /* % */
     Test.uChangeSegChance     = 20; /* % */
+    Test.uAllocatedBlocks     = 50; /* 50% allocated */
     tstVDOpenCreateWriteMerge(&Test);