Changeset 38144 in vbox for trunk

Timestamp:

Jul 25, 2011 11:01:10 AM (13 years ago)

Author:

vboxsync

Message:

wddm: fix deadlock

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -375 +375 @@
 {
     VBOXWDDM_HTABLE_ITERATOR Iter;
-    ExAcquireFastMutex(&pDevExt->ContextMutex);
-    vboxWddmHTableIterInit(&pContext->Swapchains, &Iter);
+    bool fRestart = false;
     do
     {
-        PVBOXWDDM_SWAPCHAIN pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableIterNext(&Iter, NULL);
-        if (!pSwapchain)
-            break;
-
-        /* yes, we can call remove locked even when using iterator */
-        vboxWddmSwapchainCtxRemoveLocked(pDevExt, pContext, pSwapchain);
-//        vboxWddmHTableIterRemoveCur(&Iter);
-
-        vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
-    } while (1);
+        ExAcquireFastMutex(&pDevExt->ContextMutex);
+        vboxWddmHTableIterInit(&pContext->Swapchains, &Iter);
+        do
+        {
+            PVBOXWDDM_SWAPCHAIN pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableIterNext(&Iter, NULL);
+            if (!pSwapchain)
+                break;
+
+            /* yes, we can call remove locked even when using iterator */
+            vboxWddmSwapchainCtxRemoveLocked(pDevExt, pContext, pSwapchain);
+    //        vboxWddmHTableIterRemoveCur(&Iter);
+
+            ExReleaseFastMutex(&pDevExt->ContextMutex);
+            /* we must not do vboxWddmSwapchainDestroy inside a context mutex */
+            vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
+            fRestart = true;
+        } while (1);
+    } while (fRestart);
     ExReleaseFastMutex(&pDevExt->ContextMutex);
 }