Changeset 37121 in vbox

Timestamp:

May 17, 2011 11:04:30 AM (14 years ago)

Author:

vboxsync

Message:

VD: Fix deadlock

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (6 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -2621 +2621 @@
                     && ASMAtomicCmpXchgBool(&pIoCtxParent->fComplete, true, false))
                 {
+                    RTCritSectLeave(&pDisk->CritSect);
                     LogFlowFunc(("Parent I/O context completed pIoCtxParent=%#p rcReq=%Rrc\n", pIoCtxParent, pIoCtxParent->rcReq));
                     pIoCtxParent->Type.Root.pfnComplete(pIoCtxParent->Type.Root.pvUser1,
@@ -2627 +2628 @@
                     vdThreadFinishWrite(pDisk);
                     vdIoCtxFree(pDisk, pIoCtxParent);
+                    RTCritSectEnter(&pDisk->CritSect);
                 }
 
@@ -2667 +2669 @@
                             && ASMAtomicCmpXchgBool(&pIoCtxWait->fComplete, true, false))
                         {
+                            RTCritSectLeave(&pDisk->CritSect);
                             LogFlowFunc(("Waiting I/O context completed pIoCtxWait=%#p\n", pIoCtxWait));
                             vdThreadFinishWrite(pDisk);
@@ -2673 +2676 @@
                                                               pIoCtxWait->rcReq);
                             vdIoCtxFree(pDisk, pIoCtxWait);
+                            RTCritSectEnter(&pDisk->CritSect);
                         }
                     } while (!RTListIsEmpty(&ListTmp));
@@ -2695 +2699 @@
 
                 LogFlowFunc(("I/O context completed pIoCtx=%#p rcReq=%Rrc\n", pIoCtx, pIoCtx->rcReq));
+                RTCritSectLeave(&pDisk->CritSect);
                 pIoCtx->Type.Root.pfnComplete(pIoCtx->Type.Root.pvUser1,
                                               pIoCtx->Type.Root.pvUser2,
                                               pIoCtx->rcReq);
+                RTCritSectEnter(&pDisk->CritSect);
             }
 
@@ -3495 +3501 @@
         pIoCtx->pfnIoCtxTransfer = NULL;
 
+    vdIoCtxContinue(pIoCtx, rcReq);
+
     rc = RTCritSectLeave(&pDisk->CritSect);
     AssertRC(rc);
-
-    vdIoCtxContinue(pIoCtx, rcReq);
 }