Changeset 46859 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jun 28, 2013 10:02:54 AM (12 years ago)

Author:

vboxsync

Message:

Storage/DiskIntegrity: New option to read the entire disk into memory when the VM starts

File:

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

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

@@ -161 +161 @@
     /** Flag whether consistency checks are enabled. */
     bool                    fCheckConsistency;
+    /** Flag whether the RAM disk was prepopulated. */
+    bool                    fPrepopulateRamDisk;
     /** AVL tree containing the disk blocks to check. */
     PAVLRFOFFTREE           pTreeSegments;
@@ -438 +440 @@
             else
                 cbRange = pSeg->Core.Key - offCurr;
+
+            if (pThis->fPrepopulateRamDisk)
+            {
+                /* No segment means everything should be 0 for this part. */
+                if (!RTSgBufIsZero(&SgBuf, cbRange))
+                {
+                    RTMsgError("Corrupted disk at offset %llu (expected everything to be 0)!\n",
+                               offCurr);
+                    RTAssertDebugBreak();
+                }
+            }
         }
         else
@@ -1242 +1255 @@
                                     "CheckDoubleCompletions\0"
                                     "HistorySize\0"
-                                    "IoLog\0"))
+                                    "IoLog\0"
+                                    "PrepopulateRamDisk\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -1257 +1271 @@
     rc = CFGMR3QueryU32Def(pCfg, "HistorySize", &pThis->cEntries, 512);
     AssertRC(rc);
+    rc = CFGMR3QueryBoolDef(pCfg, "PrepopulateRamDisk", &pThis->fPrepopulateRamDisk, false);
+    AssertRC(rc);
 
     char *pszIoLogFilename = NULL;
@@ -1362 +1378 @@
         rc = VDDbgIoLogCreate(&pThis->hIoLogger, pszIoLogFilename, VDDBG_IOLOG_LOG_DATA);
         MMR3HeapFree(pszIoLogFilename);
+    }
+
+    /* Read in all data before the start if requested. */
+    if (pThis->fPrepopulateRamDisk)
+    {
+        uint64_t cbDisk = 0;
+
+        LogRel(("DiskIntegrity: Prepopulating RAM disk, this will take some time...\n"));
+
+        cbDisk = pThis->pDrvMedia->pfnGetSize(pThis->pDrvMedia);
+        if (cbDisk)
+        {
+            uint64_t off = 0;
+            uint8_t abBuffer[_64K];
+            RTSGSEG Seg;
+
+            Seg.pvSeg = abBuffer;
+
+            while (cbDisk)
+            {
+                size_t cbThisRead = RT_MIN(cbDisk, sizeof(abBuffer));
+
+                rc = pThis->pDrvMedia->pfnRead(pThis->pDrvMedia, off, abBuffer, cbThisRead);
+                if (RT_FAILURE(rc))
+                    break;
+
+                if (ASMBitFirstSet(abBuffer, sizeof(abBuffer) * 8) != -1)
+                {
+                    Seg.cbSeg = cbThisRead;
+                    rc = drvdiskintWriteRecord(pThis, &Seg, 1,
+                                               off, cbThisRead);
+                    if (RT_FAILURE(rc))
+                        break;
+                }
+
+                cbDisk -= cbThisRead;
+                off    += cbThisRead;
+            }
+
+            LogRel(("DiskIntegrity: Prepopulating RAM disk finished with %Rrc\n", rc));
+        }
+        else
+            return PDMDRV_SET_ERROR(pDrvIns, VERR_INTERNAL_ERROR,
+                                    N_("DiskIntegrity: Error querying the media size below"));
     }