Changeset 38878 in vbox for trunk/src/VBox/Devices/Storage/DrvVD.cpp

Timestamp:

Sep 27, 2011 9:07:07 AM (13 years ago)

Author:

vboxsync

Message:

PDM,Devices,Drivers: Add async discard API and make us of it

File:

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

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

@@ -560 +560 @@
     PDRVVDSTORAGEBACKEND pStorageBackend = (PDRVVDSTORAGEBACKEND)pStorage;
 
-    int rc = drvvdAsyncIOFlushSync(pvUser, pStorage);
-    if (RT_SUCCESS(rc))
-        rc = PDMR3AsyncCompletionEpSetSize(pStorageBackend->pEndpoint, cbSize);
-
-    return rc;
+    return PDMR3AsyncCompletionEpSetSize(pStorageBackend->pEndpoint, cbSize);
 }
 
@@ -1674 +1670 @@
 }
 
-static DECLCALLBACK(int) drvvdDiscard(PPDMIMEDIA pInterface, PPDMRANGE paRanges, unsigned cRanges)
+static DECLCALLBACK(int) drvvdDiscard(PPDMIMEDIA pInterface, PCRTRANGE paRanges, unsigned cRanges)
 {
     LogFlowFunc(("\n"));
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
 
-    /** @todo: Fix the cast properly without allocating temporary memory (maybe move the type to IPRT). */
-    int rc = VDDiscardRanges(pThis->pDisk, (PVDRANGE)paRanges, cRanges);
+    int rc = VDDiscardRanges(pThis->pDisk, paRanges, cRanges);
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
@@ -1773 +1768 @@
     {
         rc = PDMR3BlkCacheFlush(pThis->pBlkCache, pvUser);
+        if (rc == VINF_AIO_TASK_PENDING)
+            rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
+        else if (rc == VINF_SUCCESS)
+            rc = VINF_VD_ASYNC_IO_FINISHED;
+    }
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+}
+
+static DECLCALLBACK(int) drvvdStartDiscard(PPDMIMEDIAASYNC pInterface, PCRTRANGE paRanges,
+                                           unsigned cRanges, void *pvUser)
+{
+    int rc = VINF_SUCCESS;
+    PVBOXDISK pThis = PDMIMEDIAASYNC_2_VBOXDISK(pInterface);
+
+    LogFlowFunc(("paRanges=%#p cRanges=%u pvUser=%#p\n",
+                 paRanges, cRanges, pvUser));
+
+    if (!pThis->pBlkCache)
+        rc = VDAsyncDiscardRanges(pThis->pDisk, paRanges, cRanges, drvvdAsyncReqComplete,
+                                  pThis, pvUser);
+    else
+    {
+        rc = PDMR3BlkCacheDiscard(pThis->pBlkCache, paRanges, cRanges, pvUser);
         if (rc == VINF_AIO_TASK_PENDING)
             rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
@@ -1818 +1837 @@
             rc = VERR_INVALID_PARAMETER;
     }
+
+    if (rc == VINF_VD_ASYNC_IO_FINISHED)
+        PDMR3BlkCacheIoXferComplete(pThis->pBlkCache, hIoXfer, VINF_SUCCESS);
+    else if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
+        PDMR3BlkCacheIoXferComplete(pThis->pBlkCache, hIoXfer, rc);
+
+    return VINF_SUCCESS;
+}
+
+/** @copydoc FNPDMBLKCACHEXFERENQUEUEDISCARDDRV */
+static int drvvdBlkCacheXferEnqueueDiscard(PPDMDRVINS pDrvIns, PCRTRANGE paRanges,
+                                           unsigned cRanges, PPDMBLKCACHEIOXFER hIoXfer)
+{
+    int rc = VINF_SUCCESS;
+    PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK);
+
+    rc = VDAsyncDiscardRanges(pThis->pDisk, paRanges, cRanges,
+                              drvvdAsyncReqComplete, pThis, hIoXfer);
 
     if (rc == VINF_VD_ASYNC_IO_FINISHED)
@@ -2076 +2113 @@
     pThis->IMediaAsync.pfnStartWrite      = drvvdStartWrite;
     pThis->IMediaAsync.pfnStartFlush      = drvvdStartFlush;
+    pThis->IMediaAsync.pfnStartDiscard    = drvvdStartDiscard;
 
     /* Initialize supported VD interfaces. */
@@ -2575 +2613 @@
 
         if (!fDiscard)
+        {
             pThis->IMedia.pfnDiscard = NULL;
+            pThis->IMediaAsync.pfnStartDiscard = NULL;
+        }
 
         if (RT_SUCCESS(rc))
@@ -2666 +2707 @@
     if (   fUseBlockCache
         && !pThis->fShareable
+        && !fDiscard
         && RT_SUCCESS(rc))
     {
@@ -2695 +2737 @@
                                              drvvdBlkCacheXferComplete,
                                              drvvdBlkCacheXferEnqueue,
+                                             drvvdBlkCacheXferEnqueueDiscard,
                                              pszId);
                 if (rc == VERR_NOT_SUPPORTED)