Changeset 50828 in vbox for trunk/src/VBox

Timestamp:

Mar 20, 2014 9:29:56 AM (11 years ago)

Author:

vboxsync

Message:

DisplayImpl: repaint display after a resize (better fix for a race)

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -355 +355 @@
     void vbvaReleaseCmd(VBVACMDHDR *pHdr, int32_t cbCmd);
 
-    void handleResizeCompletedEMT(void);
+    void handleResizeCompletedEMT(unsigned uScreenId);
 
     RTCRITSECT mVBVALock;

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -980 +980 @@
 
     /* The method also unlocks the framebuffer. */
-    handleResizeCompletedEMT();
+    handleResizeCompletedEMT(uScreenId);
 
     return VINF_SUCCESS;
@@ -991 +991 @@
  *  @thread EMT
  */
-void Display::handleResizeCompletedEMT (void)
+void Display::handleResizeCompletedEMT(unsigned uScreenId)
 {
     LogRelFlowFunc(("\n"));
 
-    unsigned uScreenId;
-    for (uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
-    {
+    do /* to use 'break' */
+    {
+        if (uScreenId >= mcMonitors)
+        {
+            break;
+        }
+
         DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
 
@@ -1006 +1010 @@
         {
             /* This is not the display that has completed resizing. */
-            continue;
+            AssertFailed();
+            break;
         }
 
@@ -1021 +1026 @@
             handleDisplayResize (uScreenId, pFBInfo->pendingResize.bpp, pFBInfo->pendingResize.pvVRAM,
                                  pFBInfo->pendingResize.cbLine, pFBInfo->pendingResize.w, pFBInfo->pendingResize.h, pFBInfo->pendingResize.flags);
-            continue;
+            break;
         }
 
@@ -1073 +1078 @@
         }
         LogRelFlow(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
-
-        /* Repaint the display because VM continued to run during the framebuffer resize. */
-        InvalidateAndUpdateEMT(this, uScreenId, false);
 
         /* Handle the case if there are some saved visible region that needs to be
@@ -1131 +1133 @@
         }
 #endif /* VBOX_WITH_CROGL */
-    }
+    } while(0);
 }
 
@@ -3839 +3841 @@
             fNoUpdate = true; /* Always set it here, because pfnUpdateDisplayAll can cause a new resize. */
             /* The framebuffer was resized and display data need to be updated. */
-            pDisplay->handleResizeCompletedEMT ();
+            pDisplay->handleResizeCompletedEMT(uScreenId);
             if (pFBInfo->u32ResizeStatus != ResizeStatus_Void)
             {
@@ -3845 +3847 @@
                 continue;
             }
+
+            /* Repaint the display because VM continued to run during the framebuffer resize. */
+            pDisplay->InvalidateAndUpdateEMT(pDisplay, uScreenId, false);
+
             /* Continue with normal processing because the status here is ResizeStatus_Void. */
         }