Changeset 50276 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jan 29, 2014 7:36:53 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: proper cleanup, more bugfixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_presenter.cpp (modified) (11 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -438 +438 @@
 
 CRHTABLE_HANDLE CrFbDDataAllocSlot(HCR_FRAMEBUFFER hFb);
-void CrFbDDataReleaseSlot(HCR_FRAMEBUFFER hFb, CRHTABLE_HANDLE hSlot);
+
+typedef DECLCALLBACKPTR(void, PFNCR_FRAMEBUFFER_SLOT_RELEASE_CB)(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext);
+
+void CrFbDDataReleaseSlot(HCR_FRAMEBUFFER hFb, CRHTABLE_HANDLE hSlot, PFNCR_FRAMEBUFFER_SLOT_RELEASE_CB pfnReleaseCb, void *pvContext);
 int CrFbDDataEntryPut(HCR_FRAMEBUFFER_ENTRY hEntry, CRHTABLE_HANDLE hSlot, void *pvData);
+void* CrFbDDataEntryClear(HCR_FRAMEBUFFER_ENTRY hEntry, CRHTABLE_HANDLE hSlot);
 void* CrFbDDataEntryGet(HCR_FRAMEBUFFER_ENTRY hEntry, CRHTABLE_HANDLE hSlot);
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -78 +78 @@
     void *pvVram;
     ICrFbDisplay *pDisplay;
+    RTLISTNODE EntriesList;
+    uint32_t cEntries; /* <- just for debugging */
+    uint32_t cUpdating;
     CRHTABLE SlotTable;
-    uint32_t cUpdating;
 } CR_FRAMEBUFFER;
 
@@ -120 +122 @@
     pFb->ScreenInfo.u32ViewIndex = idScreen;
     CrVrScrCompositorInit(&pFb->Compositor, &Rect);
+    RTListInit(&pFb->EntriesList);
     CrHTableCreate(&pFb->SlotTable, 0);
 }
@@ -226 +229 @@
     CrVrScrCompositorClear(&pFb->Compositor);
     CrHTableDestroy(&pFb->SlotTable);
+
+    Assert(RTListIsEmpty(&pFb->EntriesList));
+    Assert(!pFb->cEntries);
+
     memset(pFb, 0, sizeof (*pFb));
 
@@ -266 +273 @@
 {
     VBOXVR_SCR_COMPOSITOR_ENTRY Entry;
+    RTLISTNODE Node;
     uint32_t cRefs;
     CR_FBENTRY_FLAGS Flags;
@@ -464 +472 @@
     CrVrScrCompositorEntryCleanup(&pEntry->Entry);
     CrHTableDestroy(&pEntry->HTable);
+    Assert(pFb->cEntries);
+    RTListNodeRemove(&pEntry->Node);
+    --pFb->cEntries;
     crFbEntryFree(pEntry);
 }
@@ -531 +542 @@
     pEntry->Flags.Value = 0;
     CrHTableCreate(&pEntry->HTable, 0);
+
+    RTListAppend(&pFb->EntriesList, &pEntry->Node);
+    ++pFb->cEntries;
 
     return pEntry;
@@ -798 +812 @@
 }
 
-void CrFbDDataReleaseSlot(CR_FRAMEBUFFER *pFb, CRHTABLE_HANDLE hSlot)
-{
+void CrFbDDataReleaseSlot(CR_FRAMEBUFFER *pFb, CRHTABLE_HANDLE hSlot, PFNCR_FRAMEBUFFER_SLOT_RELEASE_CB pfnReleaseCb, void *pvContext)
+{
+    HCR_FRAMEBUFFER_ENTRY hEntry, hNext;
+    RTListForEachSafeCpp(&pFb->EntriesList, hEntry, hNext, CR_FRAMEBUFFER_ENTRY, Node)
+    {
+        if (CrFbDDataEntryGet(hEntry, hSlot))
+        {
+            pfnReleaseCb(pFb, hEntry, pvContext);
+            CrFbDDataEntryClear(hEntry, hSlot);
+        }
+    }
+
     CrHTableRemove(&pFb->SlotTable, hSlot);
 }
@@ -806 +830 @@
 {
     return CrHTablePutToSlot(&hEntry->HTable, hSlot, pvData);
+}
+
+void* CrFbDDataEntryClear(HCR_FRAMEBUFFER_ENTRY hEntry, CRHTABLE_HANDLE hSlot)
+{
+    return CrHTableRemove(&hEntry->HTable, hSlot);
 }
 
@@ -1114 +1143 @@
     }
 
+    static DECLCALLBACK(void) slotEntryReleaseCB(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext)
+    {
+        ((ICrFbDisplay*)pvContext)->EntryDestroyed(hFb, hEntry);
+    }
+
+    virtual void slotRelease()
+    {
+        Assert(mhSlot);
+        CrFbDDataReleaseSlot(mpFb, mhSlot, slotEntryReleaseCB, this);
+    }
+
     virtual int fbCleanup()
     {
         if (mhSlot)
         {
-            CrFbDDataReleaseSlot(mpFb, mhSlot);
+            slotRelease();
             mhSlot = 0;
         }
@@ -2437 +2477 @@
     virtual int clearCompositor()
     {
-        return fbCleanupRemoveAllEntries(true);
+        return fbCleanupRemoveAllEntries(false);
     }
 
@@ -2642 +2682 @@
     virtual int fbCleanup()
     {
-        int rc = fbCleanupRemoveAllEntries(true);
+        int rc = fbCleanupRemoveAllEntries(false);
         if (!RT_SUCCESS(rc))
         {