Changeset 31573 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2010 2:42:11 PM (14 years ago)

Author:

vboxsync

Message:

VBoxHDD: Update the transfer counter in the I/O interface at the correct position (Fix hangs after r64583)

File:

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

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

@@ -973 +973 @@
         }
 
-        if (RT_SUCCESS(rc))
-        {
-            ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbThisRead);
-        }
-        else if (rc == VERR_VD_BLOCK_FREE)
+        /* The task state will be updated on success already, don't do it here!. */
+        if (rc == VERR_VD_BLOCK_FREE)
         {
             /* No image in the chain contains the data for the block. */
@@ -2758 +2755 @@
     PVDIMAGE pImage = (PVDIMAGE)pvUser;
     PVBOXHDD pDisk  = pImage->pDisk;
+    size_t cbCopied = 0;
 
     VD_THREAD_IS_CRITSECT_OWNER(pDisk);
 
-    return vdIoCtxCopyTo(pIoCtx, (uint8_t *)pvBuf, cbBuf);
+    cbCopied = vdIoCtxCopyTo(pIoCtx, (uint8_t *)pvBuf, cbBuf);
+    Assert(cbCopied == cbBuf);
+
+    ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbCopied);
+
+    return cbCopied;
 }
 
@@ -2769 +2772 @@
     PVDIMAGE pImage = (PVDIMAGE)pvUser;
     PVBOXHDD pDisk  = pImage->pDisk;
+    size_t cbCopied = 0;
 
     VD_THREAD_IS_CRITSECT_OWNER(pDisk);
 
-    return vdIoCtxCopyFrom(pIoCtx, (uint8_t *)pvBuf, cbBuf);
+    cbCopied = vdIoCtxCopyFrom(pIoCtx, (uint8_t *)pvBuf, cbBuf);
+    Assert(cbCopied == cbBuf);
+
+    ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbCopied);
+
+    return cbCopied;
 }
 
@@ -2780 +2789 @@
     PVDIMAGE pImage = (PVDIMAGE)pvUser;
     PVBOXHDD pDisk  = pImage->pDisk;
+    size_t cbSet = 0;
 
     VD_THREAD_IS_CRITSECT_OWNER(pDisk);
 
-    return vdIoCtxSet(pIoCtx, ch, cb);
+    cbSet = vdIoCtxSet(pIoCtx, ch, cb);
+    Assert(cbSet == cb);
+
+    ASMAtomicSubU32(&pIoCtx->cbTransferLeft, cbSet);
+
+    return cbSet;
 }