Changeset 15759 in vbox

Timestamp:

Dec 25, 2008 3:57:37 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: partial fix for multithreaded guest apps (3457)

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/util/net.c (modified) (2 diffs)
• GuestHost/OpenGL/util/vboxhgcm.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/get_sizes.py (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_stream.c (modified) (1 diff)

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

@@ -293 +293 @@
 void crNetNewClient( CRConnection *conn, CRNetServer *ns )
 {
+    /*
     unsigned int len = sizeof(CRMessageNewClient);
     CRMessageNewClient msg;
@@ -304 +305 @@
 
     crNetSend( conn, NULL, &msg, len );
+    */
+
     crNetServerConnect( ns );
 }

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

@@ -902 +902 @@
 void crVBoxHGCMTearDown(void)
 {
-    int32_t i;
+    int32_t i, cCons;
 
     if (!g_crvboxhgcm.initialized) return;
 
-    for (i=0; i<g_crvboxhgcm.num_conns; i++)
-    {
-        crNetDisconnect(g_crvboxhgcm.conns[i]);
-    }
+    /* Connection count would be changed while we disconnect link, also the array of connections would be shifted*/
+    cCons = g_crvboxhgcm.num_conns;
+    for (i=0; i<cCons; i++)
+    {
+        crNetDisconnect(g_crvboxhgcm.conns[0]);
+    }
+    CRASSERT(0==g_crvboxhgcm.num_conns);
 
 #ifdef CHROMIUM_THREADSAFE

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py

@@ -360 +360 @@
             return temp->num_values;
     }
-    crError( "Invalid pname to __numValues: 0x%x\\n", (int) pname );
+    crWarning( "Invalid pname to __numValues: 0x%x\\n", (int) pname );
     return 0;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_stream.c

@@ -544 +544 @@
 crServerRecv( CRConnection *conn, CRMessage *msg, unsigned int len )
 {
+    CRMessage *pRealMsg;
     (void) len;
 
-    switch( msg->header.type )
+    pRealMsg = (msg->header.type!=CR_MESSAGE_REDIR_PTR) ? msg : (CRMessage*) msg->redirptr.pMessage;
+
+    switch( pRealMsg->header.type )
     {
         /* Called when using multiple threads */