Changeset 34336 in vbox

Timestamp:

Nov 24, 2010 6:36:40 PM (14 years ago)

Author:

vboxsync

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

68099

Message:

crOpenGL: fix multithread host assertion

File:

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

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

@@ -125 +125 @@
 
         crLockMutex(&_PackMutex);
+
         /*Make sure we process commands in order they should appear, so flush thread being injected first*/
         for (i=0; i<MAX_THREADS; ++i)
@@ -137 +138 @@
             }
         }
+
         if (i>=MAX_THREADS)
         {
-            crWarning("packspu: inject for invalid client id");
+            /*Thread we're supposed to inject commands for has been detached,
+              so there's nothing to sync with and we should just pass commands through our own connection.
+             */
+            thread->netServer.conn->u32InjectClientID=0;
         }
         crUnlockMutex(&_PackMutex);
@@ -436 +441 @@
     {
         GET_THREAD(thread);
-        CRASSERT(thread && thread->netServer.conn && thread->netServer.conn->type==CR_VBOXHGCM);
+
+        CRASSERT(thread && thread->netServer.conn && thread->netServer.conn->type==CR_VBOXHGCM && thread->bInjectThread);
         thread->netServer.conn->u32InjectClientID = id;
     }