Changeset 42591 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack

Timestamp:

Aug 4, 2012 2:35:01 PM (13 years ago)

Author:

vboxsync

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

79776

Message:

crOpenGL: fix ocasional packspu init misbeave

Location:

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

Files:

• packspu_context.c (modified) (1 diff)
• packspu_misc.c (modified) (1 diff)
• packspu_net.c (modified) (2 diffs)

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

@@ -61 +61 @@
     thread->netServer.name = crStrdup( pack_spu.name );
     thread->netServer.buffer_size = pack_spu.buffer_size;
-    if (pack_spu.numThreads == 0) {
-        packspuConnectToServer( &(thread->netServer)
-#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-                , pHgsmi
-#endif
-                );
-        if (!thread->netServer.conn) {
-            return NULL;
-        }
-        pack_spu.swap = thread->netServer.conn->swap;
-    }
-    else {
-        /* a new pthread */
-        crNetNewClient(&(thread->netServer)
-#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-                , pHgsmi
-#endif
-        );
-        CRASSERT(thread->netServer.conn);
-    }
-
+    packspuConnectToServer( &(thread->netServer)
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+            , pHgsmi
+#endif
+            );
+    CRASSERT(thread->netServer.conn);
     /* packer setup */
     CRASSERT(thread->packer == NULL);

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

@@ -490 +490 @@
         thread->netServer.buffer_size = 64 * 1024;
 
-        crNetNewClient(&(thread->netServer)
+        packspuConnectToServer(&(thread->netServer)
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
                 , pHgsmi

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

@@ -230 +230 @@
 }
 
-void packspuConnectToServer( CRNetServer *server
+static void packspuFirstConnectToServer( CRNetServer *server
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
                 , struct VBOXUHGSMI *pHgsmi
@@ -243 +243 @@
             );
 }
+
+void packspuConnectToServer( CRNetServer *server
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , struct VBOXUHGSMI *pHgsmi
+#endif
+        )
+{
+    if (pack_spu.numThreads == 0) {
+        packspuFirstConnectToServer( server
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , pHgsmi
+#endif
+                );
+        if (!server->conn) {
+            crError("packspuConnectToServer: no connection on first create!");
+            return;
+        }
+        pack_spu.swap = server->conn->swap;
+    }
+    else {
+        /* a new pthread */
+        crNetNewClient(server
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+                , pHgsmi
+#endif
+        );
+    }
+}