Changeset 27777 in vbox

Timestamp:

Mar 29, 2010 11:16:43 AM (15 years ago)

Author:

vboxsync

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

59423

Message:

2d: fix to command processing list

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (9 diffs)
• VBoxFBOverlay.h (modified) (3 diffs)

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

@@ -208 +208 @@
     VBoxVHWACommandProcessEvent ()
         : QEvent ((QEvent::Type) VBoxDefs::VHWACommandProcessType)
-    {}
+    {
+#ifdef DEBUG_misha
+        g_EventCounter.inc();
+#endif
+    }
+#ifdef DEBUG_misha
+    ~VBoxVHWACommandProcessEvent()
+    {
+        g_EventCounter.dec();
+    }
+
+    static uint32_t cPending() { return g_EventCounter.refs(); }
+private:
+    static VBoxVHWARefCounter g_EventCounter;
+#endif
 };
 
-
+#ifdef DEBUG_misha
+VBoxVHWARefCounter VBoxVHWACommandProcessEvent::g_EventCounter;
+#endif
 
 VBoxVHWAHandleTable::VBoxVHWAHandleTable(uint32_t initialSize)
@@ -4680 +4696 @@
         }
         else
+        {
+            Assert(pCur->isNewEvent());
             bFirst = false;
+        }
     } while(1);
 
@@ -4721 +4740 @@
 void VBoxVHWACommandElementProcessor::postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData, uint32_t flags)
 {
-    bool bNeedNewEvent = false;
     QObject *pNotifyObject = NULL;
     /* 1. lock*/
@@ -4744 +4762 @@
     if(mbNewEvent || (!mbProcessingList && m_CmdPipe.isEmpty()))
     {
-        pCmd->setNewEventFlag();
-        bNeedNewEvent = true;
+        pCmd->setNewEvent(true);
         mbNewEvent = false;
+        if (m_pNotifyObject)
+        {
+            m_NotifyObjectRefs.inc(); /* ensure the parent does not get destroyed while we are using it */
+            pNotifyObject = m_pNotifyObject;
+#ifdef DEBUG_misha
+            checkConsistence();
+#endif
+        }
+    }
+    else
+    {
+        pCmd->setNewEvent(false);
+#ifdef DEBUG_misha
+        if (m_pNotifyObject)
+            checkConsistence();
+#endif
     }
 
     m_CmdPipe.put(pCmd);
+#ifdef DEBUG_misha
+    if (m_pNotifyObject)
+    {
+        checkConsistence(1);
+    }
+#endif
 
     if((flags & VBOXVHWACMDPIPEC_COMPLETEEVENT) != 0)
         mbNewEvent = true;
-
-    if (bNeedNewEvent)
-    {
-        if (m_pNotifyObject)
-        {
-            m_NotifyObjectRefs.inc(); /* ensure the parent does not get destroyed while we are using it */
-            pNotifyObject = m_pNotifyObject;
-        }
-    }
 
     RTCritSectLeave(&mCritSect);
@@ -4772 +4802 @@
     }
 }
+
+#ifdef DEBUG_misha
+void VBoxVHWACommandElementProcessor::checkConsistence(uint32_t cEvents2Submit, const VBoxVHWACommandElementPipe *pPipe)
+{
+    const VBoxVHWACommandElement *pLast;
+    const VBoxVHWACommandElement *pFirst = pPipe ? pPipe->contentsRo(&pLast) : m_CmdPipe.contentsRo(&pLast);
+    uint32_t cEvents = 0;
+
+    for (const VBoxVHWACommandElement * pCur = pFirst; pCur; pCur = pCur->mpNext)
+    {
+        if (pCur->isNewEvent())
+        {
+            ++cEvents;
+            Assert(cEvents <= VBoxVHWACommandProcessEvent::cPending() + cEvents2Submit);
+        }
+    }
+//    Assert(cEvents == VBoxVHWACommandProcessEvent::cPending());
+}
+#endif
 
 void VBoxVHWACommandElementProcessor::putBack(class VBoxVHWACommandElement * pFirst2Put, VBoxVHWACommandElement * pLast2Put,
@@ -4782 +4831 @@
     m_CmdPipe.prepend(pFirst2Put, pLast2Put);
     mbProcessingList = false;
+    Assert(pFirst2Put->isNewEvent());
+#ifdef DEBUG_misha
+    Assert(VBoxVHWACommandProcessEvent::cPending());
+    const VBoxVHWACommandElement *pLast;
+    const VBoxVHWACommandElement *pFirst = m_CmdPipe.contentsRo(&pLast);
+    Assert(pFirst);
+    Assert(pLast);
+    Assert(pFirst == pFirst2Put);
+    checkConsistence();
+#endif
     RTCritSectLeave(&mCritSect);
 }
@@ -4831 +4890 @@
     }
 
+#ifdef DEBUG_misha
+    checkConsistence(cEventsNeeded);
+#endif
+
     RTCritSectLeave(&mCritSect);
 
@@ -4855 +4918 @@
         mFreeElements.pusha(pFirst2Free, pLast2Free);
     }
+
+#ifdef DEBUG_misha
+    checkConsistence();
+#endif
+
     pList = m_CmdPipe.detachList(ppLast);
+
     if (pList)
     {
@@ -4895 +4964 @@
     }
 
+    Assert(!mbProcessingList);
+
     pipe.prependFrom(&m_CmdPipe);
 
     if(!pipe.isEmpty())
-    {
         mbProcessingList = true;
-        *ppHead = pipe.detachList(ppTail);
-    }
 
     RTCritSectLeave(&mCritSect);
+
+    *ppHead = pipe.detachList(ppTail);
 }
 

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

@@ -1208 +1208 @@
     }
 
-    void setNewEventFlag() {bNewEvent = true;}
+    void setNewEvent(bool bNew) {bNewEvent = bNew;}
     bool isNewEvent() const { return bNewEvent; }
 
@@ -1294 +1294 @@
             mpLast->mpNext = pFirst;
             mpLast = pLast;
+            pLast->mpNext = NULL;
         }
     }
@@ -1413 +1414 @@
     void reset(class VBoxVHWACommandElement ** ppHead, class VBoxVHWACommandElement ** ppTail);
     void setNotifyObject(QObject *pNotifyObject);
+#ifdef DEBUG_misha
+    void checkConsistence(uint32_t cEvents2Submit = 0, const VBoxVHWACommandElementPipe *pPipe = NULL);
+#endif
 private:
     RTCRITSECT mCritSect;