Changeset 27671 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 24, 2010 3:45:38 PM (15 years ago)

Author:

vboxsync

Message:

SCSI: Fixes for the async I/O path

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvSCSI.cpp (modified) (5 diffs)
• VSCSI/VSCSIIoReq.cpp (modified) (3 diffs)

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

@@ -197 +197 @@
     VSCSIIOREQTXDIR enmTxDir = VSCSIIoReqTxDirGet(hVScsiIoReq);
 
+    LogFlowFunc(("Request hVScsiIoReq=%#p completed\n", hVScsiIoReq));
+
     if (enmTxDir == VSCSIIOREQTXDIR_READ)
         pThis->pLed->Actual.s.fReading = 0;
@@ -224 +226 @@
         VSCSIIOREQTXDIR enmTxDir;
 
+        LogFlowFunc(("Enqueuing hVScsiIoReq=%#p\n", hVScsiIoReq));
+
         enmTxDir = VSCSIIoReqTxDirGet(hVScsiIoReq);
 
@@ -231 +235 @@
             {
                 /** @todo Flush callback for the async I/O interface. */
+                ASMAtomicDecU32(&pThis->StatIoDepth);
                 VSCSIIoReqCompleted(hVScsiIoReq, VINF_SUCCESS);
                 break;
@@ -255 +260 @@
                     if (RT_FAILURE(rc))
                         AssertMsgFailed(("%s: Failed to read data %Rrc\n", __FUNCTION__, rc));
-                    STAM_REL_COUNTER_ADD(&pThis->StatBytesRead, cbSeg);
+                    STAM_REL_COUNTER_ADD(&pThis->StatBytesRead, cbTransfer);
                 }
                 else
@@ -265 +270 @@
                     if (RT_FAILURE(rc))
                         AssertMsgFailed(("%s: Failed to write data %Rrc\n", __FUNCTION__, rc));
-                    STAM_REL_COUNTER_ADD(&pThis->StatBytesWritten, cbSeg);
+                    STAM_REL_COUNTER_ADD(&pThis->StatBytesWritten, cbTransfer);
+                }
+
+                if (rc == VINF_VD_ASYNC_IO_FINISHED)
+                {
+                    if (enmTxDir == VSCSIIOREQTXDIR_READ)
+                        pThis->pLed->Actual.s.fReading = 0;
+                    else if (enmTxDir == VSCSIIOREQTXDIR_WRITE)
+                        pThis->pLed->Actual.s.fWriting = 0;
+                    else
+                        AssertMsgFailed(("Invalid transfer direction %u\n", enmTxDir));
+                    ASMAtomicDecU32(&pThis->StatIoDepth);
+                    VSCSIIoReqCompleted(hVScsiIoReq, VINF_SUCCESS);
                 }
 

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp

@@ -43 +43 @@
     pVScsiIoReq->enmTxDir  = VSCSIIOREQTXDIR_FLUSH;
 
+    ASMAtomicIncU32(&pVScsiLun->IoReq.cReqOutstanding);
+
     rc = vscsiLunReqTransferEnqueue(pVScsiLun, pVScsiIoReq);
-    if (RT_SUCCESS(rc))
-        ASMAtomicIncU32(&pVScsiLun->IoReq.cReqOutstanding);
-    else
+    if (RT_FAILURE(rc))
+    {
+        ASMAtomicDecU32(&pVScsiLun->IoReq.cReqOutstanding);
         RTMemFree(pVScsiIoReq);
+    }
 
     return rc;
@@ -75 +78 @@
     pVScsiIoReq->cSeg       = pVScsiReq->IoMemCtx.cSegments;
 
+    ASMAtomicIncU32(&pVScsiLun->IoReq.cReqOutstanding);
+
     rc = vscsiLunReqTransferEnqueue(pVScsiLun, pVScsiIoReq);
-    if (RT_SUCCESS(rc))
-        ASMAtomicIncU32(&pVScsiLun->IoReq.cReqOutstanding);
-    else
+    if (RT_FAILURE(rc))
+    {
+        ASMAtomicDecU32(&pVScsiLun->IoReq.cReqOutstanding);
         RTMemFree(pVScsiIoReq);
+    }
 
     return rc;
@@ -99 +105 @@
 
     AssertPtrReturn(pVScsiIoReq, VERR_INVALID_HANDLE);
+
+    LogFlowFunc(("hVScsiIoReq=%#p rcIoReq=%Rrc\n", hVScsiIoReq, rcIoReq));
 
     pVScsiLun = pVScsiIoReq->pVScsiLun;