Changeset 66120 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Mar 15, 2017 7:59:48 PM (8 years ago)

Author:

vboxsync

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

114011

Message:

IPRT/RTThreadWait: Quick and dirty workaround for Ctrl-C deadlock with VirtualBox.exe.

File:

• trunk/src/VBox/Runtime/common/misc/thread.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -1166 +1166 @@
             if (pThread->fFlags & RTTHREADFLAGS_WAITABLE)
             {
-                if (fAutoResume)
-                    rc = RTSemEventMultiWait(pThread->EventTerminated, cMillies);
+#if defined(IN_RING3) && defined(RT_OS_WINDOWS)
+                if (RT_LIKELY(rtThreadNativeIsAliveKludge(pThread)))
+#endif
+                {
+                    if (fAutoResume)
+                        rc = RTSemEventMultiWait(pThread->EventTerminated, cMillies);
+                    else
+                        rc = RTSemEventMultiWaitNoResume(pThread->EventTerminated, cMillies);
+                }
+#if defined(IN_RING3) && defined(RT_OS_WINDOWS)
                 else
-                    rc = RTSemEventMultiWaitNoResume(pThread->EventTerminated, cMillies);
+                {
+                    rc = VINF_SUCCESS;
+                    if (pThread->rc == VERR_PROCESS_RUNNING)
+                        pThread->rc = VERR_THREAD_IS_DEAD;
+                }
+#endif
                 if (RT_SUCCESS(rc))
                 {