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

Timestamp:

Feb 2, 2010 1:55:20 PM (15 years ago)

Author:

vboxsync

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

57156

Message:

AsyncCompletion: Fix incorrect count of outstanding write tasks. Fixes hangs during flush requests. Return VINF_AIO_TASK_PENDING if data needs to be read from the file

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (8 diffs)

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

@@ -353 +353 @@
 
     Assert(!pStorageBackend->fSyncIoPending);
-    pStorageBackend->fSyncIoPending = true;
+    ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
     DataSeg.cbSeg = cbRead;
     DataSeg.pvSeg = pvBuf;
@@ -361 +361 @@
         return rc;
 
-    /* Wait */
-    rc = RTSemEventWait(pStorageBackend->EventSem, RT_INDEFINITE_WAIT);
-    AssertRC(rc);
+    if (rc == VINF_AIO_TASK_PENDING)
+    {
+        /* Wait */
+        rc = RTSemEventWait(pStorageBackend->EventSem, RT_INDEFINITE_WAIT);
+        AssertRC(rc);
+    }
+    else
+        ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, false);
 
     if (pcbRead)
@@ -380 +385 @@
 
     Assert(!pStorageBackend->fSyncIoPending);
-    pStorageBackend->fSyncIoPending = true;
+    ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
     DataSeg.cbSeg = cbWrite;
     DataSeg.pvSeg = (void *)pvBuf;
@@ -388 +393 @@
         return rc;
 
-    /* Wait */
-    rc = RTSemEventWait(pStorageBackend->EventSem, RT_INDEFINITE_WAIT);
-    AssertRC(rc);
+    if (rc == VINF_AIO_TASK_PENDING)
+    {
+        /* Wait */
+        rc = RTSemEventWait(pStorageBackend->EventSem, RT_INDEFINITE_WAIT);
+        AssertRC(rc);
+    }
+    else
+        ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, false);
 
     if (pcbWritten)
@@ -405 +415 @@
 
     Assert(!pStorageBackend->fSyncIoPending);
-    pStorageBackend->fSyncIoPending = true;
+    ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, true);
 
     int rc = PDMR3AsyncCompletionEpFlush(pStorageBackend->pEndpoint, NULL, &pTask);
@@ -411 +421 @@
         return rc;
 
-    /* Wait */
-    rc = RTSemEventWait(pStorageBackend->EventSem, RT_INDEFINITE_WAIT);
-    AssertRC(rc);
+    if (rc == VINF_AIO_TASK_PENDING)
+    {
+        /* Wait */
+        rc = RTSemEventWait(pStorageBackend->EventSem, RT_INDEFINITE_WAIT);
+        AssertRC(rc);
+    }
+    else
+        ASMAtomicXchgBool(&pStorageBackend->fSyncIoPending, false);
 
     return VINF_SUCCESS;
@@ -1104 +1119 @@
                 break;
             }
-            rc = CFGMR3QueryBoolDef(pCurNode, "UseNewIo", &fUseNewIo, false);
+            rc = CFGMR3QueryBoolDef(pCurNode, "UseNewIo", &fUseNewIo, true);
             if (RT_FAILURE(rc))
             {
@@ -1248 +1263 @@
         if (rc == VERR_NOT_SUPPORTED)
         {
-            /* Seems async I/O is not supported by the backend, open in normal mode. */
             pThis->fAsyncIOSupported = false;
             uOpenFlags &= ~VD_OPEN_FLAGS_ASYNC_IO;