Changeset 45580 in vbox for trunk

Timestamp:

Apr 16, 2013 6:34:32 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: added some locking to the framebuffer code to hopefully prevent crashes on shut-down.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -159 +159 @@
 
     NOREF(uScreenId);
-    /* A resize event can happen while we are switching machine view classes,
-     * but we synchronise afterwards so that shouldn't be a problem.  We must
-     * temporarily remove the framebuffer in Display though while switching
-     * to respect the thread synchronisation logic (see UIFrameBuffer.h). */
+    *pbFinished = FALSE;
+    lock();  /* See comment in setView(). */
     if (m_pMachineView)
         QApplication::postEvent(m_pMachineView,
@@ -169 +167 @@
                                                   uWidth, uHeight));
     else
-    {
         /* Report to the VM thread that we finished resizing and rely on the
          * synchronisation when the new view is attached. */
         *pbFinished = TRUE;
-        return S_OK;
-    }
-
-    *pbFinished = FALSE;
+    unlock();
+
     return S_OK;
 }
@@ -201 +196 @@
     *pbSupported = TRUE;
 
-    if (!m_pMachineView)
-        return S_OK;
-    QSize screen = m_pMachineView->maxGuestSize();
+    lock();  /* See comment in setView(). */
+    QSize screen;
+    if (m_pMachineView)
+        screen = m_pMachineView->maxGuestSize();
+    unlock();
     if (   (screen.width() != 0)
         && (uWidth > (ULONG)screen.width())
@@ -250 +247 @@
         ++ rects;
     }
-    QApplication::postEvent(m_pMachineView, new UISetRegionEvent(reg));
+    lock();  /* See comment in setView(). */
+    if (m_pMachineView)
+        QApplication::postEvent(m_pMachineView, new UISetRegionEvent(reg));
+    unlock();
 
     return S_OK;
@@ -272 +272 @@
 void UIFrameBuffer::setView(UIMachineView * pView)
 {
+    /* We are not supposed to use locking for things which are done
+     * on the GUI thread.  Unfortunately I am not clever enough to
+     * understand the original author's wise synchronisation logic
+     * so I will do it anyway. */
+    lock();
     m_pMachineView = pView;
     m_WinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
-}
+    unlock();
+}