Changeset 77872 in vbox for trunk/src

Timestamp:

Mar 25, 2019 5:16:23 PM (6 years ago)

Author:

vboxsync

Message:

Main/HostDnsServiceDarwin: Fix hang during shutdown due to m_fStop variable not being set to true during shutdown and make sure the runloop is really stopped by using CFRunLoopStop() instead of CFRunLoopWakeUp(), also use atomics when accessing m_fStop and mark it as volatile

File:

• trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp

@@ -20 +20 @@
 
 
+#include <iprt/asm.h>
 #include <iprt/errcore.h>
 #include <iprt/thread.h>
@@ -41 +42 @@
     CFRunLoopRef m_RunLoopRef;
     CFRunLoopSourceRef m_Stopper;
-    bool m_fStop;
+    volatile bool m_fStop;
     RTSEMEVENT m_evtStop;
     static void performShutdownCallback(void *);
@@ -122 +123 @@
     if (!m->m_fStop)
     {
+        ASMAtomicXchgBool(&m->m_fStop, true);
         CFRunLoopSourceSignal(m->m_Stopper);
-        CFRunLoopWakeUp(m->m_RunLoopRef);
+        CFRunLoopStop(m->m_RunLoopRef);
 
         RTSemEventWait(m->m_evtStop, RT_INDEFINITE_WAIT);
@@ -153 +155 @@
     monitorThreadInitializationDone();
 
-    while (!m->m_fStop)
+    while (!ASMAtomicReadBool(&m->m_fStop))
     {
         CFRunLoopRun();