Changeset 49470 in vbox for trunk/src/VBox

Timestamp:

Nov 13, 2013 2:58:33 PM (11 years ago)

Author:

vboxsync

Message:

Additions/3D: prevent an OpenGL dead-lock.

File:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -210 +210 @@
 #endif
 
+    /* Try to keep a consistent locking order. */
+    crHashtableLock(stub.windowTable);
 #if defined(CR_NEWWINTRACK) && !defined(WINDOWS)
     crLockMutex(&stub.mutex);
@@ -215 +217 @@
 
     stubCheckWindowState(context->currentDrawable, GL_TRUE);
-    crHashtableWalk(stub.windowTable, stubCheckWindowsCB, context);
+    crHashtableWalkUnlocked(stub.windowTable, stubCheckWindowsCB, context);
 
 #if defined(CR_NEWWINTRACK) && !defined(WINDOWS)
     crUnlockMutex(&stub.mutex);
 #endif
+    crHashtableUnlock(stub.windowTable);
 }
 
@@ -892 +895 @@
         }
 #else
+        /* Try to keep a consistent locking order. */
+        crHashtableLock(stub.windowTable);
         crLockMutex(&stub.mutex);
-        crHashtableWalk(stub.windowTable, stubSyncTrCheckWindowsCB, NULL);
+        crHashtableWalkUnlocked(stub.windowTable, stubSyncTrCheckWindowsCB, NULL);
         crUnlockMutex(&stub.mutex);
+        crHashtableUnlock(stub.windowTable);
         RTThreadSleep(50);
 #endif