Changeset 44887 in vbox for trunk/src/VBox

Timestamp:

Mar 1, 2013 3:20:32 PM (12 years ago)

Author:

vboxsync

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

84055

Message:

crOpenGL: more window attr handling fixes

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_hash.h (modified) (1 diff)
• GuestHost/OpenGL/util/hash.c (modified) (2 diffs)
• GuestHost/OpenGL/util/util.def (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu.c (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu.h (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_init.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_hash.h

@@ -48 +48 @@
 DECLEXPORT(GLboolean) crHashtableIsKeyUsed( const CRHashTable *h, GLuint id );
 DECLEXPORT(void) crHashtableWalk( CRHashTable *hash, CRHashtableWalkCallback walkFunc , void *data);
+/* walk the hashtable w/o holding the table lock */
+DECLEXPORT(void) crHashtableWalkUnlocked( CRHashTable *hash, CRHashtableWalkCallback walkFunc , void *data);
 /*Returns GL_TRUE if given hashtable hold the data, pKey is updated with key value for data in this case*/
 DECLEXPORT(GLboolean) crHashtableGetDataKey(CRHashTable *pHash, void *pData, unsigned long *pKey);

trunk/src/VBox/GuestHost/OpenGL/util/hash.c

@@ -421 +421 @@
 }
 
-void crHashtableWalk( CRHashTable *hash, CRHashtableWalkCallback walkFunc , void *dataPtr2)
+void crHashtableWalkUnlocked( CRHashTable *hash, CRHashtableWalkCallback walkFunc , void *dataPtr2)
 {
     int i;
     CRHashNode *entry, *next;
 
-    if (!hash)
-        return;
-
-#ifdef CHROMIUM_THREADSAFE
-    crLockMutex(&hash->mutex);
-#endif
     for (i = 0; i < CR_NUM_BUCKETS; i++)
     {
@@ -445 +439 @@
         }
     }
+}
+
+void crHashtableWalk( CRHashTable *hash, CRHashtableWalkCallback walkFunc , void *dataPtr2)
+{
+    if (!hash)
+        return;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&hash->mutex);
+#endif
+    crHashtableWalkUnlocked(hash, walkFunc , dataPtr2);
 #ifdef CHROMIUM_THREADSAFE
     crUnlockMutex(&hash->mutex);

trunk/src/VBox/GuestHost/OpenGL/util/util.def

@@ -83 +83 @@
 crHashtableNumElements
 crHashtableWalk
+crHashtableWalkUnlocked
 crHashtableAllocRegisterKey
 crAllocHashtable
@@ -148 +149 @@
 crHashtableDeleteBlock
 crHashtableIsKeyUsed
-crHashtableWalk
 crMatrixInit
 crMatrixInitFromString

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -421 +421 @@
         showIt = 0;
     else
-        showIt = window->BltInfo.Base.id != CR_RENDER_DEFAULT_WINDOW_ID;
-
+        showIt = (id != CR_RENDER_DEFAULT_WINDOW_ID);
 
     /*
@@ -813 +812 @@
         crWarning("RTCritSectEnter failed rc %d", rc);
     }
+}
+
+static void renderspuVBoxCompositorClearAllCB(unsigned long key, void *data1, void *data2)
+{
+    WindowInfo *window = (WindowInfo *) data1;
+    renderspuVBoxCompositorSet(window, NULL);
+}
+
+void renderspuVBoxCompositorClearAll()
+{
+    /* we need to clear window compositor, which is not that trivial though,
+     * since the lock order used in presentation thread is compositor lock() -> hash table lock (aquired for id->window resolution)
+     * this is why, to prevent potential deadlocks, we use crHashtableWalkUnlocked that does not hold the table lock
+     * we are can be sure noone will modify the table here since renderspuVBoxCompositorClearAll can be called in the command (hgcm) thread only,
+     * and the table can be modified from that thread only as well */
+    crHashtableWalkUnlocked(render_spu.windowTable, renderspuVBoxCompositorClearAllCB, NULL);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -393 +393 @@
 extern int renderspuCreateFunctions( SPUNamedFunctionTable table[] );
 extern void renderspuVBoxCompositorSet( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor);
+extern void renderspuVBoxCompositorClearAll();
 extern struct VBOXVR_SCR_COMPOSITOR * renderspuVBoxCompositorAcquire( WindowInfo *window);
 extern int renderspuVBoxCompositorTryAcquire(WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR **ppCompositor);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -431 +431 @@
 static int renderSPUCleanup(void)
 {
+    renderspuVBoxCompositorClearAll();
     crFreeHashtable(render_spu.contextTable, DeleteContextCallback);
     render_spu.contextTable = NULL;