Changeset 78816 in vbox for trunk

Timestamp:

May 28, 2019 1:06:56 PM (6 years ago)

Author:

vboxsync

Message:

Additions/crOpenGL/load.c: Don't hang on exit if stubSPUSafeTearDown() is called on the sync thread due to an X11 error for example

File:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -469 +469 @@
         ASMAtomicWriteBool(&stub.bShutdownSyncThread, true);
         {
-            int rc = RTThreadWait(stub.hSyncThread, RT_INDEFINITE_WAIT, NULL);
-            if (RT_FAILURE(rc))
+            /* stubSPUSafeTearDown() can be called from the sync thread in case
+             * of an X11 error:
+             *     XGetGeometry() -> [...] -> _XError() -> exit() -> [...] -> stubExitHandler() -> stubSPUSafetearDown())
+             * Don't hang in that case.
+             */
+            RTTHREAD hSelf = RTThreadSelf();
+            if (hSelf != stub.hSyncThread)
             {
-                WARN(("RTThreadWait_join failed %i", rc));
+                int rc = RTThreadWait(stub.hSyncThread, RT_INDEFINITE_WAIT, NULL);
+                if (RT_FAILURE(rc))
+                    WARN(("RTThreadWait_join failed %i", rc));
             }
         }