vbox的更動 46065 路徑 trunk/src/VBox/Main/src-client

時間撮記:

2013-5-14 下午01:15:42 (12 年 以前)

作者:

vboxsync

訊息:

Main/DisplayImpl: 6711: Fix for the race condition where in GA sends the new resize rectangle dimensions while framebuffer is still resizing. At this moment DisplayImpl doesn't have the updated framebuffer rectangles and as a result the intersection between the new rectangles passed by GA and current frambuffe is NULL. Thus DisplayImpl rejects the rectangles passed from GA and GUI receives NULL for drawing.
The fix for the issue is to let DisplayImpl save the rectangles passed from the GA till the point framebuffer is completely resized and then pass these rectangle to GUI after checking for intersection with the curent newly resized framebuffer.

檔案:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (修改) (6 筆差異)

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

@@ -123 +123 @@
     int rc = RTCritSectInit(&mVBVALock);
     AssertRC(rc);
+    
+    rc = RTCritSectInit(&mSaveSeamlessRectLock);
+    AssertRC(rc);
+    
     mfu32PendingVideoAccelDisable = false;
 
@@ -143 +147 @@
         RTCritSectDelete (&mVBVALock);
         memset (&mVBVALock, 0, sizeof (mVBVALock));
+    }
+    
+    if (RTCritSectIsInitialized (&mSaveSeamlessRectLock))
+    {
+        RTCritSectDelete (&mSaveSeamlessRectLock);
+        memset (&mSaveSeamlessRectLock, 0, sizeof (mSaveSeamlessRectLock));
     }
     BaseFinalRelease();
@@ -821 +831 @@
         }
         LogRelFlow(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
+        
+        /* Handle the case if there are some saved visible region that needs to be 
+         * applied after the resize of the framebuffer is completed 
+         */
+        if (pFBInfo->mcSavedVisibleRegion)
+        {
+            handleSetVisibleRegion(pFBInfo->mcSavedVisibleRegion,
+                                   pFBInfo->mpSavedVisibleRegion);
+
+            SaveSeamlessRectLock();
+            if (pFBInfo->mpSavedVisibleRegion)
+                RTMemFree(pFBInfo->mpSavedVisibleRegion);
+            pFBInfo->mpSavedVisibleRegion = NULL;
+            pFBInfo->mcSavedVisibleRegion = 0;
+            SaveSeamlessRectUnLock();
+        }
+
 
 #ifdef DEBUG_sunlover
@@ -1082 +1109 @@
         if (!pFBInfo->pFramebuffer.isNull())
         {
+            if (pFBInfo->u32ResizeStatus != ResizeStatus_Void)
+            {
+                /* handle the case where new rectangles are received from the GA
+                 * when framebuffer resizing is in progress.
+                 * Just save the rectangles to be applied for later time when FB resizing is complete
+                 * (from handleResizeCompletedEMT).
+                 * This is done to prevent a race condition where a new rectangles are received
+                 * from the GA after a resize event and framebuffer resizing is still in progress
+                 * As a result the coordinates of the framebuffer are still
+                 * not updated and hence there is no intersection with the new rectangles passed
+                 * for the new region (THis is checked in the above if condition ). With 0 intersection,
+                 * cRectVisibleRegions = 0  is returned to the GUI and if GUI has invalidated its
+                 * earlier region then it draws nothihing and seamless mode doesn't display the 
+                 * guest desktop.
+                 */
+                SaveSeamlessRectLock();
+                if(pFBInfo->mpSavedVisibleRegion)
+                    RTMemFree(pFBInfo->mpSavedVisibleRegion);
+                
+                pFBInfo->mpSavedVisibleRegion = (RTRECT *)RTMemTmpAlloc(  RT_MAX(cRect, 1)
+                                                                        * sizeof (RTRECT));
+                if (pFBInfo->mpSavedVisibleRegion)
+                {
+                    memcpy(pFBInfo->mpSavedVisibleRegion, pRect, cRect * sizeof(RTRECT));
+                    pFBInfo->mcSavedVisibleRegion = cRect;
+                }
+                SaveSeamlessRectUnLock();
+                continue;
+            }
             /* Prepare a new array of rectangles which intersect with the framebuffer.
              */
@@ -1123 +1179 @@
                 }
             }
-
             pFBInfo->pFramebuffer->SetVisibleRegion((BYTE *)pVisibleRegion, cRectVisibleRegion);
         }
@@ -1361 +1416 @@
     RTCritSectLeave(&mVBVALock);
 }
+ 
+int Display::SaveSeamlessRectLock(void)
+{
+    return RTCritSectEnter(&mSaveSeamlessRectLock);
+}
+    
+void Display::SaveSeamlessRectUnLock(void)
+{
+    RTCritSectLeave(&mSaveSeamlessRectLock);
+}
+    
 
 /**