Changeset 21576 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jul 14, 2009 12:29:26 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix deadlocks and context/window tracking for multithreaded apps(public #3922)

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_context.c (modified) (1 diff)
• server_window.c (modified) (2 diffs)

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

@@ -144 +144 @@
                 break;
             }
+
+        /*Some application call destroy context not in a thread where it was created...have do deal with it.*/
+        if (CR_MAX_CONTEXTS==pos)
+        {
+            int32_t client;
+
+            for (client=0; client<cr_server.numClients; ++client)
+            {
+                if (cr_server.clients[client]==cr_server.curClient)
+                    continue;
+
+                for (pos = 0; pos < CR_MAX_CONTEXTS; ++pos)
+                    if (cr_server.clients[client]->contextList[pos] == ctx)
+                    {
+                        cr_server.clients[client]->contextList[pos] = 0;
+                        break;
+                    }
+
+                if (pos<CR_MAX_CONTEXTS)
+                {
+                    if (cr_server.clients[client]->currentCtx == crCtx)
+                    {
+                        cr_server.clients[client]->currentContextNumber = -1;
+                        cr_server.clients[client]->currentCtx = cr_server.DummyContext;
+                    }
+                    break;
+                }
+            }
+        }
+
         CRASSERT(pos<CR_MAX_CONTEXTS);
     }

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

@@ -144 +144 @@
     if (cr_server.curClient)
     {
+        if (cr_server.curClient->currentMural == mural)
+        {
+            cr_server.curClient->currentMural = NULL;
+            cr_server.curClient->currentWindow = -1;
+        }
+
         for (pos = 0; pos < CR_MAX_WINDOWS; ++pos)
             if (cr_server.curClient->windowList[pos] == window)
@@ -150 +156 @@
                 break;
             }
+
+        /*Same as with contexts, some apps destroy it not in a thread where it was created*/
+        if (CR_MAX_WINDOWS==pos)
+        {
+            int32_t client;
+
+            for (client=0; client<cr_server.numClients; ++client)
+            {
+                if (cr_server.clients[client]==cr_server.curClient)
+                    continue;
+
+                for (pos = 0; pos < CR_MAX_WINDOWS; ++pos)
+                    if (cr_server.clients[client]->windowList[pos] == window)
+                    {
+                        cr_server.clients[client]->windowList[pos] = 0;
+                        break;
+                    }
+
+                if (pos<CR_MAX_WINDOWS)
+                {
+                    if (cr_server.clients[client]->currentMural == mural)
+                    {
+                        cr_server.clients[client]->currentMural = NULL;
+                        cr_server.clients[client]->currentWindow = -1;
+                    }
+                    break;
+                }
+            }
+        }
+
         CRASSERT(pos<CR_MAX_WINDOWS);
-
-        if (cr_server.curClient->currentMural == mural)
-        {
-            cr_server.curClient->currentMural = NULL;
-            cr_server.curClient->currentWindow = -1;
-        }
     }