Changeset 29240 in vbox

Timestamp:

May 8, 2010 4:16:10 PM (15 years ago)

Author:

vboxsync

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

61322

Message:

VBoxHDD: Bring back error reporting for the new async I/O code

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (11 diffs)

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

@@ -228 +228 @@
     /** Flag whether the I/O context is blocked because it is in the growing list. */
     bool                         fBlocked;
+    /** Number of data transfers currently pending. */
+    volatile uint32_t            cDataTransfersPending;
     /** How many meta data transfers are pending. */
     volatile uint32_t            cMetaTransfersPending;
@@ -596 +598 @@
         pIoCtx->uOffset               = uOffset;
         pIoCtx->cbTransfer            = cbTransfer;
+        pIoCtx->cDataTransfersPending = 0;
         pIoCtx->cMetaTransfersPending = 0;
         pIoCtx->fComplete             = false;
@@ -749 +752 @@
     if (   !pIoCtx->cbTransferLeft
         && !pIoCtx->cMetaTransfersPending
+        && !pIoCtx->cDataTransfersPending
         && !pIoCtx->pfnIoCtxTransfer)
+        return VINF_VD_ASYNC_IO_FINISHED;
+
+    /*
+     * We complete the I/O context in case of an error
+     * if there is no I/O task pending.
+     */
+    if (   RT_FAILURE(pIoCtx->rcReq)
+        && !pIoCtx->cMetaTransfersPending
+        && !pIoCtx->cDataTransfersPending)
         return VINF_VD_ASYNC_IO_FINISHED;
 
@@ -774 +787 @@
     if (   RT_SUCCESS(rc)
         && !pIoCtx->cbTransferLeft
-        && !pIoCtx->cMetaTransfersPending)
+        && !pIoCtx->cMetaTransfersPending
+        && !pIoCtx->cDataTransfersPending)
         rc = VINF_VD_ASYNC_IO_FINISHED;
     else if (RT_SUCCESS(rc))
         rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
+    else
+    {
+        ASMAtomicCmpXchgS32(&pIoCtx->rcReq, rc, VINF_SUCCESS);
+        /*
+         * The I/O context completed if we have an error and there is no data
+         * or meta data transfer pending.
+         */
+        if (   !pIoCtx->cMetaTransfersPending
+            && !pIoCtx->cDataTransfersPending)
+            rc = VINF_VD_ASYNC_IO_FINISHED;
+    }
 
     LogFlowFunc(("pIoCtx=%#p rc=%Rrc cbTransferLeft=%u cMetaTransfersPending=%u fComplete=%RTbool\n",
@@ -1771 +1796 @@
 
     if (!pIoTask->fMeta)
+    {
         ASMAtomicSubU32(&pIoCtx->cbTransferLeft, pIoTask->Type.User.cbTransfer);
+        ASMAtomicDecU32(&pIoCtx->cDataTransfersPending);
+    }
     else
     {
@@ -1783 +1811 @@
     vdIoTaskFree(pDisk, pIoTask);
 
+    if (RT_FAILURE(rcReq))
+        ASMAtomicCmpXchgS32(&pIoCtx->rcReq, rcReq, VINF_SUCCESS);
+
     if (!pIoCtx->fBlocked)
     {
@@ -1804 +1835 @@
                 ASMAtomicSubU32(&pIoCtxParent->cbTransferLeft, pIoCtx->Type.Child.cbTransferParent);
 
+                if (RT_FAILURE(pIoCtx->rcReq))
+                    ASMAtomicCmpXchgS32(&pIoCtxParent->rcReq, pIoCtx->rcReq, VINF_SUCCESS);
+ 
                 /*
                  * A completed child write means that we finsihed growing the image.
@@ -2020 +2054 @@
             return VERR_NO_MEMORY;
 
+        ASMAtomicIncU32(&pIoCtx->cDataTransfersPending);
+
         void *pvTask;
         int rc2 = pDisk->pInterfaceAsyncIOCallbacks->pfnReadAsync(pDisk->pInterfaceAsyncIO->pvUser,
@@ -2030 +2066 @@
             AssertMsg(cbTaskRead <= pIoCtx->cbTransferLeft, ("Impossible!\n"));
             ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbTaskRead);
+            ASMAtomicDecU32(&pIoCtx->cDataTransfersPending);
             vdIoTaskFree(pDisk, pIoTask);
         }
@@ -2081 +2118 @@
         if (!pIoTask)
             return VERR_NO_MEMORY;
+
+        ASMAtomicIncU32(&pIoCtx->cDataTransfersPending);
 
         void *pvTask;
@@ -2092 +2131 @@
             AssertMsg(cbTaskWrite <= pIoCtx->cbTransferLeft, ("Impossible!\n"));
             ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbTaskWrite);
+            ASMAtomicDecU32(&pIoCtx->cDataTransfersPending);
             vdIoTaskFree(pDisk, pIoTask);
         }