Changeset 2106 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Apr 16, 2007 3:25:48 PM (18 years ago)

Author:

vboxsync

Message:

Do not block EMT while resizing the framebuffer.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• DisplayImpl.cpp (modified) (9 diffs)
• DisplayImpl.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -93 +93 @@
     mcbVbvaPartial = 0;
 
-    RTSemEventMultiCreate(&mResizeSem);
     RTSemEventMultiCreate(&mUpdateSem);
 
     // reset the event sems
-    RTSemEventMultiReset(mResizeSem);
     RTSemEventMultiReset(mUpdateSem);
 
@@ -105 +103 @@
     mInternalFramebuffer = true;
     mFramebufferOpened = false;
+
+    mu32ResizeStatus = ResizeStatus_Void;
 }
 
@@ -110 +110 @@
 {
     mFramebuffer = 0;
-    RTSemEventMultiDestroy(mResizeSem);
     RTSemEventMultiDestroy(mUpdateSem);
 }
@@ -124 +123 @@
  * @param h New display height
  */
-void VMDisplay::handleDisplayResize (int w, int h)
+int VMDisplay::handleDisplayResize (int w, int h)
 {
     LogFlow(("VMDisplay::handleDisplayResize(): w=%d, h=%d\n", w, h));
@@ -130 +129 @@
     // if there is no Framebuffer, this call is not interesting
     if (mFramebuffer == NULL)
-        return;
-
-     // callback into the Framebuffer to notify it
+        return VINF_SUCCESS;
+
+    /* Atomically set the resize status before calling the framebuffer. The new InProgress status will
+     * disable access to the VGA device by the EMT thread.
+     */
+    bool f = ASMAtomicCmpXchgU32 (&mu32ResizeStatus, ResizeStatus_InProgress, ResizeStatus_Void);
+    AssertRelease(f);NOREF(f);
+
+    // callback into the Framebuffer to notify it
     BOOL finished;
 
     mFramebuffer->Lock();
-
-    /* Reset the event here. It could be signalled before it gets to after 'if (!finished)' */
-    RTSemEventMultiReset(mResizeSem);
 
     mFramebuffer->RequestResize(w, h, &finished);
@@ -150 +152 @@
          */
 
-        /// @todo is this compatible with VBOX_NEXT_STEP?
-        // the framebuffer needs more time to process
-        // the event so we have to halt the VM until it's done
-        RTSemEventMultiWait(mResizeSem, RT_INDEFINITE_WAIT);
-    }
-
-    updateDisplayData();
-
-    mFramebuffer->Unlock();
-    return;
+        return VINF_VGA_RESIZE_IN_PROGRESS;
+    }
+
+    /* Set the status so the 'handleResizeCompleted' would work.  */
+    f = ASMAtomicCmpXchgU32 (&mu32ResizeStatus, ResizeStatus_UpdateDisplayData, ResizeStatus_InProgress);
+    AssertRelease(f);NOREF(f);
+
+    /* The method also unlocks the framebuffer. */
+    handleResizeCompletedEMT();
+
+    return VINF_SUCCESS;
+}
+
+/**
+ *  Framebuffer has been resized.
+ *  Read the new display data and unlock the framebuffer.
+ *
+ *  @thread EMT
+ */
+void VMDisplay::handleResizeCompletedEMT (void)
+{
+    LogFlowFunc(("\n"));
+    if (mFramebuffer)
+    {
+        /* Framebuffer has completed the resize. Update the connector data. */
+        updateDisplayData();
+    
+        mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, true);
+
+        /* Unlock framebuffer. */
+        mFramebuffer->Unlock();
+    }
+
+    /* Go into non resizing state. */
+    bool f = ASMAtomicCmpXchgU32 (&mu32ResizeStatus, ResizeStatus_Void, ResizeStatus_UpdateDisplayData);
+    AssertRelease(f);NOREF(f);
 }
 
@@ -176 +204 @@
         return E_FAIL;
 
-    /* The framebuffer can already be locked by the thread waiting for completion; due to recent
-     * changes when calling the VGA device. We don't really need to lock it here, so just don't
-     * bother.
-     */
-    //mFramebuffer->Lock();
-    // signal our semaphore
-    RTSemEventMultiSignal(mResizeSem);
-    //mFramebuffer->Unlock();
+    /* Set the flag indicating that the resize has completed and display data need to be updated. */
+    bool f = ASMAtomicCmpXchgU32 (&mu32ResizeStatus, ResizeStatus_UpdateDisplayData, ResizeStatus_InProgress);
+    AssertRelease(f);NOREF(f);
 
     return S_OK;
@@ -423 +446 @@
  * @param  cy         New height in pixels.
  */
-DECLCALLBACK(void) VMDisplay::displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy)
+DECLCALLBACK(int) VMDisplay::displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy)
 {
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
 
     // forward call to instance handler
-    pDrv->pDisplay->handleDisplayResize(cx, cy);
+    return pDrv->pDisplay->handleDisplayResize(cx, cy);
 }
 
@@ -465 +488 @@
 
     VMDisplay *pDisplay = pDrv->pDisplay;
+
+    uint32_t u32ResizeStatus = pDisplay->mu32ResizeStatus;
+    
+    if (u32ResizeStatus == ResizeStatus_UpdateDisplayData)
+    {
+#ifdef DEBUG_sunlover
+        LogFlowFunc (("ResizeStatus_UpdateDisplayData\n"));
+#endif /* DEBUG_sunlover */
+        /* The framebuffer was resized and display data need to be updated. */
+        pDisplay->handleResizeCompletedEMT ();
+        /* Continue with normal processing because the status here is ResizeStatus_Void. */
+        Assert (pDisplay->mu32ResizeStatus == ResizeStatus_Void);
+    }
+    else if (u32ResizeStatus == ResizeStatus_InProgress)
+    {
+#ifdef DEBUG_sunlover
+        LogFlowFunc (("ResizeStatus_InProcess\n"));
+#endif /* DEBUG_sunlover */
+        /* The framebuffer is being resized. Do not call the VGA device back. Immediately return. */
+        return;
+    }
 
     if (pDisplay->mfPendingVideoAccelEnable)

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -39 +39 @@
 
     // public methods only for internal purposes
-    void handleDisplayResize (int w, int h);
+    int handleDisplayResize (int w, int h);
     void handleDisplayUpdate (int x, int y, int cx, int cy);
 
@@ -67 +67 @@
     static DECLCALLBACK(void*) drvQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
     static DECLCALLBACK(int)   drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle);
-    static DECLCALLBACK(void)  displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy);
+    static DECLCALLBACK(int)   displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy);
     static DECLCALLBACK(void)  displayUpdateCallback(PPDMIDISPLAYCONNECTOR pInterface,
                                                      uint32_t x, uint32_t y, uint32_t cx, uint32_t cy);
@@ -82 +82 @@
 
     ULONG mSupportedAccelOps;
-    RTSEMEVENTMULTI mResizeSem;
     RTSEMEVENTMULTI mUpdateSem;
 
@@ -97 +96 @@
     bool vbvaFetchCmd (struct _VBVACMDHDR **ppHdr, uint32_t *pcbCmd);
     void vbvaReleaseCmd (struct _VBVACMDHDR *pHdr, int32_t cbCmd);
+
+    void VMDisplay::handleResizeCompletedEMT (void);
+    volatile uint32_t mu32ResizeStatus;
+    
+    enum {
+        ResizeStatus_Void,
+        ResizeStatus_InProgress,
+        ResizeStatus_UpdateDisplayData
+    };
 };