Changeset 44415 in vbox

Timestamp:

Jan 28, 2013 11:28:44 AM (12 years ago)

Author:

vboxsync

Message:

Storage: Merge sync/async path for flush requests

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (10 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -423 +423 @@
 } VDIOCTX;
 
+/** Default flags for an I/O context, i.e. unblocked and async. */
+#define VDIOCTX_FLAGS_DEFAULT (0)
 /** Flag whether the context is blocked. */
 #define VDIOCTX_FLAGS_BLOCKED RT_BIT_32(0)
@@ -1313 +1315 @@
                                       void *pvUser1, void *pvUser2,
                                       void *pvAllocation,
-                                      PFNVDIOCTXTRANSFER pfnIoCtxTransfer)
+                                      PFNVDIOCTXTRANSFER pfnIoCtxTransfer,
+                                      uint32_t fFlags)
 {
     PVDIOCTX pIoCtx = vdIoCtxAlloc(pDisk, enmTxDir, uOffset, cbTransfer, pImageStart,
-                                   pcSgBuf, pvAllocation, pfnIoCtxTransfer, 0);
+                                   pcSgBuf, pvAllocation, pfnIoCtxTransfer, fFlags);
 
     if (RT_LIKELY(pIoCtx))
@@ -1762 +1765 @@
         rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
     }
+
+    return rc;
+}
+
+/**
+ * Process the I/O context in a synchronous manner, waiting
+ * for it to complete.
+ *
+ * @returns VBox status code of the completed request.
+ * @param   pIoCtx    The sync I/O context.
+ */
+static int vdIoCtxProcessSync(PVDIOCTX pIoCtx)
+{
+    int rc = VINF_SUCCESS;
+    PVBOXHDD pDisk = pIoCtx->pDisk;
+
+    LogFlowFunc(("pIoCtx=%p\n", pIoCtx));
+
+    AssertMsg(pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC,
+              ("I/O context is not marked as synchronous\n"));
+
+    rc = vdIoCtxProcessTryLockDefer(pIoCtx);
+    if (rc == VINF_VD_ASYNC_IO_FINISHED)
+        rc = VINF_SUCCESS;
+
+    if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
+    {
+        rc = RTSemEventWait(pDisk->hEventSemSyncIo, RT_INDEFINITE_WAIT);
+        AssertRC(rc);
+
+        rc = pDisk->rcSync;
+    }
+    else /* Success or error. */
+        vdIoCtxFree(pDisk, pIoCtx);
 
     return rc;
@@ -2891 +2928 @@
         vdResetModifiedFlag(pDisk);
         rc = pImage->Backend->pfnFlush(pImage->pBackendData, pIoCtx);
-        if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
-            rc = VINF_SUCCESS;
-        else if (rc == VINF_VD_ASYNC_IO_FINISHED)
-            vdIoCtxUnlockDisk(pDisk, pIoCtx, true /* fProcessDeferredReqs */);
+        if (   (   RT_SUCCESS(rc)
+                || rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
+            && pDisk->pCache)
+        {
+            rc = pDisk->pCache->Backend->pfnFlush(pDisk->pCache->pBackendData, pIoCtx);
+            if (   RT_SUCCESS(rc)
+                || rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
+                vdIoCtxUnlockDisk(pDisk, pIoCtx, true /* fProcessBlockedReqs */);
+        }
+        else
+            vdIoCtxUnlockDisk(pDisk, pIoCtx, true /* fProcessBlockedReqs */);
     }
 
@@ -8199 +8243 @@
         AssertPtrBreakStmt(pImage, rc = VERR_VD_NOT_OPENED);
 
-        vdResetModifiedFlag(pDisk);
-
-        VDIOCTX IoCtx;
-        vdIoCtxInit(&IoCtx, pDisk, VDIOCTXTXDIR_FLUSH, 0, 0, NULL,
-                    NULL, NULL, NULL, VDIOCTX_FLAGS_SYNC);
-        rc = pImage->Backend->pfnFlush(pImage->pBackendData, &IoCtx);
-
-        if (   RT_SUCCESS(rc)
-            && pDisk->pCache)
-            rc = pDisk->pCache->Backend->pfnFlush(pDisk->pCache->pBackendData, &IoCtx);
+        PVDIOCTX pIoCtx = vdIoCtxRootAlloc(pDisk, VDIOCTXTXDIR_FLUSH, 0,
+                                           0, pDisk->pLast, NULL,
+                                           vdIoCtxSyncComplete, pDisk, NULL,
+                                           NULL, vdFlushHelperAsync,
+                                           VDIOCTX_FLAGS_SYNC);
+
+        if (!pIoCtx)
+        {
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+
+        rc = vdIoCtxProcessSync(pIoCtx);
     } while (0);
 
@@ -9532 +9579 @@
         }
 
-        rc = vdIoCtxProcessTryLockDefer(pIoCtx);
-        if (rc == VINF_VD_ASYNC_IO_FINISHED)
-            rc = VINF_SUCCESS;
-
-        if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
-        {
-            rc = RTSemEventWait(pDisk->hEventSemSyncIo, RT_INDEFINITE_WAIT);
-            AssertRC(rc);
-
-            rc = pDisk->rcSync;
-        }
-        else /* Success or error. */
-            vdIoCtxFree(pDisk, pIoCtx);
+        rc = vdIoCtxProcessSync(pIoCtx);
     } while (0);
 
@@ -9598 +9633 @@
                                   cbRead, pDisk->pLast, pcSgBuf,
                                   pfnComplete, pvUser1, pvUser2,
-                                  NULL, vdReadHelperAsync);
+                                  NULL, vdReadHelperAsync,
+                                  VDIOCTX_FLAGS_DEFAULT);
         if (!pIoCtx)
         {
@@ -9669 +9705 @@
                                   cbWrite, pDisk->pLast, pcSgBuf,
                                   pfnComplete, pvUser1, pvUser2,
-                                  NULL, vdWriteHelperAsync);
+                                  NULL, vdWriteHelperAsync,
+                                  VDIOCTX_FLAGS_DEFAULT);
         if (!pIoCtx)
         {
@@ -9725 +9762 @@
                                   0, pDisk->pLast, NULL,
                                   pfnComplete, pvUser1, pvUser2,
-                                  NULL, vdFlushHelperAsync);
+                                  NULL, vdFlushHelperAsync,
+                                  VDIOCTX_FLAGS_DEFAULT);
         if (!pIoCtx)
         {
@@ -9781 +9819 @@
                                      pfnComplete, pvUser1, pvUser2, NULL,
                                      vdDiscardHelperAsync,
-                                     0 /* fFlags */);
+                                     VDIOCTX_FLAGS_DEFAULT);
         if (!pIoCtx)
         {