Changeset 29006 in vbox

Timestamp:

May 4, 2010 11:37:42 AM (15 years ago)

Author:

vboxsync

Message:

VBoxHDD: Move the FinishWrite call from DrvVD to VBoxHDD where we can determine the type of the operation (read/write)

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvVD.cpp (modified) (1 diff)
• VBoxHDD.cpp (modified) (6 diffs)

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

@@ -302 +302 @@
         rc = pStorageBackend->pfnCompleted(pvUser, rcReq);
         AssertRC(rc);
-
-        /* If thread synchronization is active, then signal the end of the
-         * this disk read/write operation. */
-        /** @todo provide a way to determine the type of task (read/write)
-         * which was completed, see also VBoxHDD.cpp. */
-        if (RT_UNLIKELY(pStorageBackend->pInterfaceThreadSyncCallbacks))
-        {
-            int rc2 = pStorageBackend->pInterfaceThreadSyncCallbacks->pfnFinishWrite(pStorageBackend->pInterfaceThreadSync->pvUser);
-            AssertRC(rc2);
-        }
     }
 }

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

@@ -1816 +1816 @@
                                                         pIoCtxParent->Type.Root.pvUser2,
                                                         pIoCtxParent->rcReq);
+                    vdThreadFinishWrite(pDisk);
                     vdIoCtxFree(pDisk, pIoCtxParent);
                 }
@@ -1855 +1856 @@
                         {
                             LogFlowFunc(("Waiting I/O context completed pIoCtxWait=%#p\n", pIoCtxWait));
+                            vdThreadFinishWrite(pDisk);
                             pIoCtxWait->Type.Root.pfnComplete(pIoCtxWait->Type.Root.pvUser1,
                                                               pIoCtxWait->Type.Root.pvUser2,
@@ -1866 +1868 @@
             }
             else
+            {
+                if (pIoCtx->enmTxDir == VDIOCTXTXDIR_WRITE)
+                    vdThreadFinishWrite(pDisk);
+                else
+                    vdThreadFinishRead(pDisk);
+
                 pIoCtx->Type.Root.pfnComplete(pIoCtx->Type.Root.pvUser1,
                                               pIoCtx->Type.Root.pvUser2,
                                               pIoCtx->rcReq);
+            }
 
             vdIoCtxFree(pDisk, pIoCtx);
@@ -5967 +5976 @@
     } while (0);
 
-    if (RT_UNLIKELY(fLockRead) && (rc != VINF_VD_ASYNC_IO_FINISHED))
+    if (RT_UNLIKELY(fLockRead) && (   rc == VINF_VD_ASYNC_IO_FINISHED
+                                   || rc != VERR_VD_ASYNC_IO_IN_PROGRESS))
     {
         rc2 = vdThreadFinishRead(pDisk);
@@ -6042 +6052 @@
     } while (0);
 
-    if (RT_UNLIKELY(fLockWrite) && RT_FAILURE(rc))
+    if (RT_UNLIKELY(fLockWrite) && (   rc == VINF_VD_ASYNC_IO_FINISHED
+                                    || rc != VERR_VD_ASYNC_IO_IN_PROGRESS))
     {
         rc2 = vdThreadFinishWrite(pDisk);
@@ -6088 +6099 @@
 
         rc = vdIoCtxProcess(pIoCtx);
+        if (rc == VINF_VD_ASYNC_IO_FINISHED)
+        {
+            if (ASMAtomicCmpXchgBool(&pIoCtx->fComplete, true, false))
+                vdIoCtxFree(pDisk, pIoCtx);
+            else
+                rc = VERR_VD_ASYNC_IO_IN_PROGRESS; /* Let the other handler complete the request. */
+        }
+        else if (rc != VERR_VD_ASYNC_IO_IN_PROGRESS) /* Another error */
+            vdIoCtxFree(pDisk, pIoCtx);
     } while (0);
 
-    if (RT_UNLIKELY(fLockWrite) && RT_FAILURE(rc))
+    if (RT_UNLIKELY(fLockWrite) && (   rc == VINF_VD_ASYNC_IO_FINISHED
+                                    || rc != VERR_VD_ASYNC_IO_IN_PROGRESS))
     {
         rc2 = vdThreadFinishWrite(pDisk);
         AssertRC(rc2);
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        if (   !pIoCtx->cbTransferLeft
-            && !pIoCtx->cMetaTransfersPending
-            && ASMAtomicCmpXchgBool(&pIoCtx->fComplete, true, false))
-        {
-            vdIoCtxFree(pDisk, pIoCtx);
-            rc = VINF_VD_ASYNC_IO_FINISHED;
-        }
-        else
-        {
-            LogFlow(("cbTransferLeft=%u cMetaTransfersPending=%u fComplete=%RTbool\n",
-                     pIoCtx->cbTransferLeft, pIoCtx->cMetaTransfersPending,
-                     pIoCtx->fComplete));
-            rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
-        }
     }