Changeset 24162 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 29, 2009 3:25:14 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

54101

Message:

2d accel: fix reset handling

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (3 diffs)
• src/VBoxFBOverlay.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -919 +919 @@
     void completeCurrentEvent();
     class VBoxVHWACommandElement * detachCmdList(class VBoxVHWACommandElement * pFirst2Free, VBoxVHWACommandElement * pLast2Free);
-
+    void reset(class VBoxVHWACommandElement ** ppHead, class VBoxVHWACommandElement ** ppTail);
 private:
     RTCRITSECT mCritSect;
@@ -926 +926 @@
     class VBoxConsoleView *mView;
     bool mbNewEvent;
+    bool mbProcessingList;
     VBoxVHWACommandElementStack mFreeElements;
     VBoxVHWACommandElement mElementsBuffer[2048];
@@ -1247 +1248 @@
 
     int vhwaConstruct(struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd);
+
+    int reset();
 
     VBoxGLWidget *mpOverlayWidget;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -4724 +4724 @@
 }
 
+int VBoxQGLOverlay::reset()
+{
+    VBoxVHWACommandElement * pHead, * pTail;
+    mCmdPipe.reset(&pHead, &pTail);
+    if(pHead)
+    {
+        CDisplay display = mView->console().GetDisplay();
+        Assert (!display.isNull());
+
+        /* complete aborted commands */
+        for(VBoxVHWACommandElement * pCur = pHead; pCur; pCur = pCur->mpNext)
+        {
+            switch(pCur->type())
+            {
+#ifdef VBOX_WITH_VIDEOHWACCEL
+            case VBOXVHWA_PIPECMD_VHWA:
+                {
+                    struct _VBOXVHWACMD * pCmd = pCur->vhwaCmd();
+                    pCmd->rc = VERR_INVALID_STATE;
+                    display.CompleteVHWACommand((BYTE*)pCmd);
+                }
+                break;
+            case VBOXVHWA_PIPECMD_OP:
+                /* should not happen, don't handle this for now */
+                Assert(0);
+                break;
+            case VBOXVHWA_PIPECMD_FUNC:
+                /* should not happen, don't handle this for now */
+                Assert(0);
+                break;
+#endif
+            }
+        }
+
+        VBoxVHWACommandElement *pTest = mCmdPipe.detachCmdList(pHead, pTail);
+        Assert(!pTest);
+        NOREF(pTest);
+    }
+    return VINF_SUCCESS;
+}
+
 int VBoxQGLOverlay::onVHWACommand(struct _VBOXVHWACMD * pCmd)
 {
@@ -4734 +4775 @@
             flags |= VBOXVHWACMDPIPEC_COMPLETEEVENT;
             break;
+        case VBOXVHWACMD_TYPE_HH_RESET:
+        {
+            /* we do not post a reset command to the gui thread since this may lead to a deadlock
+             * when reset is initiated by the gui thread*/
+            pCmd->Flags &= ~VBOXVHWACMD_FLAG_HG_ASYNCH;
+            pCmd->rc = reset();
+            return VINF_SUCCESS;
+        }
         default:
             break;
@@ -5301 +5350 @@
 
 
-VBoxVHWACommandElementProcessor::VBoxVHWACommandElementProcessor(VBoxConsoleView *aView)
+VBoxVHWACommandElementProcessor::VBoxVHWACommandElementProcessor(VBoxConsoleView *aView) :
+    mpFirstEvent (NULL),
+    mpLastEvent (NULL),
+    mbNewEvent (false),
+    mbProcessingList (false)
 {
     int rc = RTCritSectInit(&mCritSect);
     AssertRC(rc);
 
-    mpFirstEvent = NULL;
-    mpLastEvent = NULL;
-    mbNewEvent = false;
     mView = aView;
+
     for(int i = RT_ELEMENTS(mElementsBuffer) - 1; i >= 0; i--)
     {
@@ -5408 +5459 @@
     {
         pList = mpFirstEvent->pipe().detachList();
-        if(!pList)
+        if(pList)
+        {
+            /* assume the caller atimically calls detachCmdList to free the elements obtained now those and reset the state */
+            mbProcessingList = true;
+            RTCritSectLeave(&mCritSect);
+            return pList;
+        }
+        else
         {
             VBoxVHWACommandProcessEvent *pNext = mpFirstEvent->mpNext;
@@ -5422 +5480 @@
         }
     }
+
+    /* assume the caller atimically calls detachCmdList to free the elements obtained now those and reset the state */
+    mbProcessingList = false;
     RTCritSectLeave(&mCritSect);
-
-    return pList;
-}
-
+    return NULL;
+}
+
+/* it is currently assumed no one sends any new commands while reset is in progress */
+void VBoxVHWACommandElementProcessor::reset(VBoxVHWACommandElement ** ppHead, VBoxVHWACommandElement ** ppTail)
+{
+    VBoxVHWACommandElement * pHead = NULL;
+    VBoxVHWACommandElement * pTail = NULL;
+    VBoxVHWACommandProcessEvent * pFirst;
+    VBoxVHWACommandProcessEvent * pLast;
+    RTCritSectEnter(&mCritSect);
+    pFirst = mpFirstEvent;
+    pLast = mpLastEvent;
+    mpFirstEvent = NULL;
+    mpLastEvent = NULL;
+
+    if(mbProcessingList)
+    {
+        for(;;)
+        {
+            RTCritSectLeave(&mCritSect);
+            RTThreadSleep(2000); /* 2 ms */
+            RTCritSectEnter(&mCritSect);
+            /* it is assumed no one sends any new commands while reset is in progress */
+            Assert(!mpFirstEvent);
+            Assert(!mpLastEvent);
+            if(!mbProcessingList)
+            {
+                break;
+            }
+        }
+    }
+
+    if(pFirst)
+    {
+        Assert(pLast);
+        pHead = pFirst->pipe().detachList();
+        VBoxVHWACommandElement * pCurHead;
+        for(VBoxVHWACommandProcessEvent * pCur = pFirst; pCur ; pCur = pCur->mpNext)
+        {
+            pCurHead = pCur->pipe().detachList();
+            if(!pCurHead)
+                continue;
+            if(!pHead)
+                pHead = pCurHead;
+            if(pTail)
+                pTail->mpNext = pCurHead;
+
+            for(VBoxVHWACommandElement * pCurEl = pCurHead; pCurEl; pCurEl = pCurEl->mpNext)
+            {
+                pTail = pCurEl;
+            }
+        }
+
+        if(!pTail)
+            pTail = pHead;
+    }
+
+    if(pHead)
+        mbProcessingList = true;
+
+    RTCritSectLeave(&mCritSect);
+
+    *ppHead = pHead;
+    *ppTail = pTail;
+}
 
 void VBoxVHWACommandsQueue::enqueue(PFNVBOXQGLFUNC pfn, void* pContext1, void* pContext2)