Changeset 35845 in vbox

Timestamp:

Feb 4, 2011 7:11:09 AM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: proper deadlock fix for r69838

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_misc.c (modified) (2 diffs)
• packspu_net.c (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -134 +134 @@
                 && pack_spu.thread[i].packer && pack_spu.thread[i].packer->currentBuffer)
             {
-                crUnlockMutex(&_PackMutex);
                 packspuFlush((void *) &pack_spu.thread[i]);
                 break;
@@ -146 +145 @@
              */
             thread->netServer.conn->u32InjectClientID=0;
-            crUnlockMutex(&_PackMutex);
-        } 
+        }
+
+        crUnlockMutex(&_PackMutex);
 
         packspuFlush((void *) thread);

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c

@@ -120 +120 @@
     CRPackBuffer *buf;
 
-#ifdef CHROMIUM_THREADSAFE
-    crLockMutex(&_PackMutex);
-#endif
-
     /* we should _always_ pass a valid <arg> value */
-    CRASSERT(thread);
+    CRASSERT(thread && thread->inUse);
 #ifdef CHROMIUM_THREADSAFE
     CR_LOCK_PACKER_CONTEXT(thread->packer);
@@ -152 +148 @@
 #ifdef CHROMIUM_THREADSAFE
            CR_UNLOCK_PACKER_CONTEXT(thread->packer);
-           crUnlockMutex(&_PackMutex);
 #endif
            return;
@@ -183 +178 @@
 #ifdef CHROMIUM_THREADSAFE
     CR_UNLOCK_PACKER_CONTEXT(thread->packer);
-    crUnlockMutex(&_PackMutex);
 #endif
 }