Changeset 77995 in vbox

Timestamp:

Apr 3, 2019 3:29:37 PM (6 years ago)

Author:

vboxsync

Message:

Main/HostDnsService: Build fix.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.h (modified) (2 diffs)
• darwin/HostDnsServiceDarwin.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/HostDnsService.h

@@ -139 +139 @@
 {
 public:
+
     HostDnsServiceDarwin();
     virtual ~HostDnsServiceDarwin();
@@ -243 +244 @@
     HRESULT init(HostDnsMonitorProxy *pProxy);
     void uninit(void);
+
 protected:
 

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

@@ -58 +58 @@
 }
 
-
 HostDnsServiceDarwin::~HostDnsServiceDarwin()
 {
-    if (!m)
-        return;
-
-    monitorThreadShutdown();
-
-    CFRelease(m->m_RunLoopRef);
-
-    CFRelease(m->m_DnsWatcher);
-
-    CFRelease(m->m_store);
-
-    RTSemEventDestroy(m->m_evtStop);
-
-    delete m;
-    m = NULL;
-}
-
+    if (m != NULL)
+        delete m;
+}
 
 void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *, void *, void *info)
@@ -119 +104 @@
 }
 
-
-void HostDnsServiceDarwin::monitorThreadShutdown(void)
+void HostDnsServiceDarwin::uninit(void)
+{
+    CFRelease(m->m_RunLoopRef);
+
+    CFRelease(m->m_DnsWatcher);
+
+    CFRelease(m->m_store);
+
+    RTSemEventDestroy(m->m_evtStop);
+
+    HostDnsServiceBase::uninit();
+}
+
+void HostDnsServiceDarwin::monitorThreadShutdown(RTMSINTERVAL uTimeoutMs)
 {
     RTCLock grab(m_LockMtx);
@@ -129 +126 @@
         CFRunLoopStop(m->m_RunLoopRef);
 
-        RTSemEventWait(m->m_evtStop, RT_INDEFINITE_WAIT);
-    }
-}
-
+        RTSemEventWait(m->m_evtStop, uTimeoutMs);
+    }
+}
 
 int HostDnsServiceDarwin::monitorThreadProc(void)