Changeset 29412 in vbox

Timestamp:

May 12, 2010 12:28:02 PM (15 years ago)

Author:

vboxsync

Message:

DiskIntegrity: Pass async flush requests

File:

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

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

@@ -41 +41 @@
 
 /**
+ * Transfer direction.
+ */
+typedef enum DRVDISKAIOTXDIR
+{
+    /** Read */
+    DRVDISKAIOTXDIR_READ = 0,
+    /** Write */
+    DRVDISKAIOTXDIR_WRITE,
+    /** Flush */
+    DRVDISKAIOTXDIR_FLUSH
+} DRVDISKAIOTXDIR;
+
+/**
  * async I/O request.
  */
 typedef struct DRVDISKAIOREQ
 {
-    /** Flag whether this is a read or write request. */
-    bool      fRead;
+    /** Transfer direction. */
+    DRVDISKAIOTXDIR enmTxDir;
     /** Start offset. */
     uint64_t  off;
@@ -156 +169 @@
  *
  * @returns New I/O request.
- * @param   fRead         Flag whether this is a read or a write.
+ * @param   enmTxDir      Transfer direction.
  * @param   off           Start offset.
  * @param   paSeg         Segment array.
@@ -163 +176 @@
  * @param   pvUser        User argument.
  */
-static PDRVDISKAIOREQ drvdiskintIoReqAlloc(bool fRead, uint64_t off, PCRTSGSEG paSeg,
+static PDRVDISKAIOREQ drvdiskintIoReqAlloc(DRVDISKAIOTXDIR enmTxDir, uint64_t off, PCRTSGSEG paSeg,
                                            unsigned cSeg, size_t cbTransfer, void *pvUser)
 {
@@ -170 +183 @@
     if (RT_LIKELY(pIoReq))
     {
-        pIoReq->fRead      = fRead;
+        pIoReq->enmTxDir   = enmTxDir;
         pIoReq->off        = off;
         pIoReq->cbTransfer = cbTransfer;
@@ -529 +542 @@
              uOffset, paSeg, cSeg, cbRead, pvUser));
     PDRVDISKINTEGRITY pThis = PDMIMEDIAASYNC_2_DRVDISKINTEGRITY(pInterface);
-    PDRVDISKAIOREQ pIoReq = drvdiskintIoReqAlloc(true, uOffset, paSeg, cSeg, cbRead, pvUser);
+    PDRVDISKAIOREQ pIoReq = drvdiskintIoReqAlloc(DRVDISKAIOTXDIR_READ, uOffset, paSeg, cSeg, cbRead, pvUser);
     AssertPtr(pIoReq);
 
@@ -564 +577 @@
              uOffset, paSeg, cSeg, cbWrite, pvUser));
     PDRVDISKINTEGRITY pThis = PDMIMEDIAASYNC_2_DRVDISKINTEGRITY(pInterface);
-    PDRVDISKAIOREQ pIoReq = drvdiskintIoReqAlloc(false, uOffset, paSeg, cSeg, cbWrite, pvUser);
+    PDRVDISKAIOREQ pIoReq = drvdiskintIoReqAlloc(DRVDISKAIOTXDIR_WRITE, uOffset, paSeg, cSeg, cbWrite, pvUser);
     AssertPtr(pIoReq);
 
@@ -593 +606 @@
 }
 
+/** @copydoc PDMIMEDIAASYNC::pfnStartFlush */
+static DECLCALLBACK(int) drvdiskintStartFlush(PPDMIMEDIAASYNC pInterface, void *pvUser)
+{
+    PDRVDISKINTEGRITY pThis = PDMIMEDIAASYNC_2_DRVDISKINTEGRITY(pInterface);
+    PDRVDISKAIOREQ pIoReq = drvdiskintIoReqAlloc(DRVDISKAIOTXDIR_FLUSH, 0, NULL, 0, 0, pvUser);
+    AssertPtr(pIoReq);
+
+    return pThis->pDrvMediaAsync->pfnStartFlush(pThis->pDrvMediaAsync, pIoReq);
+}
+
 /** @copydoc PDMIMEDIA::pfnFlush */
 static DECLCALLBACK(int) drvdiskintFlush(PPDMIMEDIA pInterface)
@@ -672 +695 @@
     if (RT_SUCCESS(rcReq) && pThis->fCheckConsistency)
     {
-        if (pIoReq->fRead)
+        if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_READ)
             rc = drvdiskintReadVerify(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
+        else if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_WRITE)
+            rc = drvdiskintWriteRecord(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
         else
-            rc = drvdiskintWriteRecord(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
+            AssertMsg(pIoReq->enmTxDir == DRVDISKAIOTXDIR_FLUSH, ("Huh?\n"));
 
         AssertRC(rc);
@@ -789 +814 @@
     pThis->IMediaAsync.pfnStartRead      = drvdiskintStartRead;
     pThis->IMediaAsync.pfnStartWrite     = drvdiskintStartWrite;
+    pThis->IMediaAsync.pfnStartFlush     = drvdiskintStartFlush;
 
     /* IMediaAsyncPort. */