Changeset 38631 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 5, 2011 10:53:16 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73838

Message:

IoLog+DrvDiskIntegrity: Add logging of discard requests

File:

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

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

@@ -569 +569 @@
     if (pThis->hIoLogger)
     {
-        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGTXDIR_READ, off,
+        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGREQ_READ, off,
                              cbRead, NULL, &hIoLogEntry);
         AssertRC(rc);
@@ -622 +622 @@
         RTSgBufInit(&SgBuf, &Seg, 1);
 
-        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGTXDIR_WRITE, off,
+        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGREQ_WRITE, off,
                              cbWrite, &SgBuf, &hIoLogEntry);
         AssertRC(rc);
@@ -665 +665 @@
     if (pThis->hIoLogger)
     {
-        int rc2 = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGTXDIR_READ, uOffset,
+        int rc2 = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGREQ_READ, uOffset,
                                   cbRead, NULL, &pIoReq->hIoLogEntry);
         AssertRC(rc2);
@@ -721 +721 @@
         RTSgBufInit(&SgBuf, paSeg, cSeg);
 
-        int rc2 = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGTXDIR_WRITE, uOffset,
+        int rc2 = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGREQ_WRITE, uOffset,
                                   cbWrite, &SgBuf, &pIoReq->hIoLogEntry);
         AssertRC(rc2);
@@ -768 +768 @@
     if (pThis->hIoLogger)
     {
-        rc = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGTXDIR_FLUSH, 0,
+        rc = VDDbgIoLogStart(pThis->hIoLogger, true, VDDBGIOLOGREQ_FLUSH, 0,
                              0, NULL, &pIoReq->hIoLogEntry);
         AssertRC(rc);
@@ -801 +801 @@
     if (pThis->hIoLogger)
     {
-        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGTXDIR_FLUSH, 0,
+        rc = VDDbgIoLogStart(pThis->hIoLogger, false, VDDBGIOLOGREQ_FLUSH, 0,
                              0, NULL, &hIoLogEntry);
         AssertRC(rc);
@@ -868 +868 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
     return pThis->pDrvMedia->pfnGetUuid(pThis->pDrvMedia, pUuid);
+}
+
+/** @copydoc PDMIMEDIA::pfnDiscard */
+static DECLCALLBACK(int) drvdiskintDiscard(PPDMIMEDIA pInterface, PPDMRANGE paRanges, unsigned cRanges)
+{
+    int rc = VINF_SUCCESS;
+    VDIOLOGENT hIoLogEntry;
+    PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
+
+    if (pThis->hIoLogger)
+    {
+        rc = VDDbgIoLogStartDiscard(pThis->hIoLogger, false, (PVDRANGE)paRanges, cRanges, &hIoLogEntry);
+        AssertRC(rc);
+    }
+
+    rc = pThis->pDrvMedia->pfnDiscard(pThis->pDrvMedia, paRanges, cRanges);
+
+    if (pThis->hIoLogger)
+    {
+        int rc2 = VDDbgIoLogComplete(pThis->hIoLogger, hIoLogEntry, rc, NULL);
+        AssertRC(rc2);
+    }
+
+    return rc;
 }
 
@@ -1097 +1121 @@
 
     pThis->pDrvMediaAsync = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIAASYNC);
+
+    if (pThis->pDrvMedia->pfnDiscard)
+        pThis->IMedia.pfnDiscard = drvdiskintDiscard;
 
     if (pThis->fCheckConsistency)