Changeset 50263 in vbox for trunk/src/VBox/Main/src-server/darwin

Timestamp:

Jan 28, 2014 7:29:52 PM (11 years ago)

Author:

vboxsync

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

91891

Message:

Main/HostDnsService:

• Generic part could be used with threading on or off: OS which can monitor changes on DNS structures might need this (e.g. Windows, Darwin, Linux)
• ResolvConf based (Linux, Solaris, FreeBSD ans Os/2) doesn't use scanf based resovl.conf parsing new Slirp's parser used instead. It's configured to provide strings instead of addresses. (to resolve xtracker/7034c2)
• Darwin monitoring code has been refactored.
• linux changed to handle cases described in xtracker/7034c3
• Windows monitors changes on register changes.

File:

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

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

@@ -32 +32 @@
 
 
-
-SCDynamicStoreRef g_store;
-CFRunLoopSourceRef g_DnsWatcher;
-CFRunLoopRef g_RunLoopRef;
-RTTHREAD g_DnsMonitoringThread;
-RTSEMEVENT g_DnsInitEvent;
+struct HostDnsServiceDarwin::Data
+{
+    SCDynamicStoreRef m_store;
+    CFRunLoopSourceRef m_DnsWatcher;
+    CFRunLoopRef m_RunLoopRef;
+    CFRunLoopSourceRef m_Stopper;
+    bool m_fStop;
+    RTSEMEVENT m_evtStop;
+    static void performShutdownCallback(void *);
+};
+
 
 static const CFStringRef kStateNetworkGlobalDNSKey = CFSTR("State:/Network/Global/DNS");
 
-static int hostMonitoringRoutine(RTTHREAD ThreadSelf, void *pvUser)
-{
-    NOREF(ThreadSelf);
-    NOREF(pvUser);
-    g_RunLoopRef = CFRunLoopGetCurrent();
-    AssertReturn(g_RunLoopRef, VERR_INTERNAL_ERROR);
-
-    CFRetain(g_RunLoopRef);
+
+HostDnsServiceDarwin::HostDnsServiceDarwin():HostDnsMonitor(true),m(NULL)
+{
+    m = new HostDnsServiceDarwin::Data();
+}
+
+
+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;
+}
+
+
+void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *, void *, void *info)
+{
+    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)info;
+
+    ALock l(pThis);
+    pThis->updateInfo();
+    pThis->notifyAll();
+}
+
+
+HRESULT HostDnsServiceDarwin::init()
+{
+    SCDynamicStoreContext ctx;
+    RT_ZERO(ctx);
+
+    ctx.info = this;
+
+    m->m_store = SCDynamicStoreCreate(NULL, CFSTR("org.virtualbox.VBoxSVC"),
+                                   (SCDynamicStoreCallBack)HostDnsServiceDarwin::hostDnsServiceStoreCallback,
+                                   &ctx);
+    AssertReturn(m->m_store, E_FAIL);
+
+    m->m_DnsWatcher = SCDynamicStoreCreateRunLoopSource(NULL, m->m_store, 0);
+    if (!m->m_DnsWatcher)
+        return E_OUTOFMEMORY;
+
+    int rc = RTSemEventCreate(&m->m_evtStop);
+    AssertRCReturn(rc, E_FAIL);
+
+    CFRunLoopSourceContext sctx;
+    RT_ZERO(sctx);
+    sctx.perform = HostDnsServiceDarwin::Data::performShutdownCallback;
+    m->m_Stopper = CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &sctx);
+    AssertReturn(m->m_Stopper, E_FAIL);
+
+    HRESULT hrc = HostDnsMonitor::init();
+    AssertComRCReturn(hrc, hrc);
+
+    return updateInfo();
+}
+
+
+void HostDnsServiceDarwin::monitorThreadShutdown()
+{
+    ALock l(this);
+    if (!m->m_fStop)
+    {
+        CFRunLoopSourceSignal(m->m_Stopper);
+        CFRunLoopWakeUp(m->m_RunLoopRef);
+        
+        RTSemEventWait(m->m_evtStop, RT_INDEFINITE_WAIT);
+    }
+}
+
+
+int HostDnsServiceDarwin::monitorWorker()
+{
+    m->m_RunLoopRef = CFRunLoopGetCurrent();
+    AssertReturn(m->m_RunLoopRef, VERR_INTERNAL_ERROR);
+
+    CFRetain(m->m_RunLoopRef);
 
     CFArrayRef watchingArrayRef = CFArrayCreate(NULL,
@@ -55 +140 @@
     if (!watchingArrayRef)
     {
-        CFRelease(g_DnsWatcher);
+        CFRelease(m->m_DnsWatcher);
         return E_OUTOFMEMORY;
     }
 
-    if(SCDynamicStoreSetNotificationKeys(g_store, watchingArrayRef, NULL))
-        CFRunLoopAddSource(CFRunLoopGetCurrent(), g_DnsWatcher, kCFRunLoopCommonModes);
+    if(SCDynamicStoreSetNotificationKeys(m->m_store, watchingArrayRef, NULL))
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), m->m_DnsWatcher, kCFRunLoopCommonModes);
 
     CFRelease(watchingArrayRef);
 
-    RTSemEventSignal(g_DnsInitEvent);
-
-    CFRunLoopRun();
-
-    CFRelease(g_RunLoopRef);
+    monitorThreadInitializationDone();
+
+    while (!m->m_fStop)
+    {
+        CFRunLoopRun();
+    }
+
+    CFRelease(m->m_RunLoopRef);
+
+    /* We're notifying stopper thread. */
+    RTSemEventSignal(m->m_evtStop);
 
     return VINF_SUCCESS;
@@ -74 +165 @@
 
 
-HostDnsServiceDarwin::HostDnsServiceDarwin(){}
-
-
-HostDnsServiceDarwin::~HostDnsServiceDarwin()
-{
-    if (g_RunLoopRef)
-        CFRunLoopStop(g_RunLoopRef);
-
-    CFRelease(g_DnsWatcher);
-
-    CFRelease(g_store);
-}
-
-
-void HostDnsServiceDarwin::hostDnsServiceStoreCallback(void *arg0, void *arg1, void *info)
-{
-    HostDnsServiceDarwin *pThis = (HostDnsServiceDarwin *)info;
-
-    NOREF(arg0); /* SCDynamicStore */
-    NOREF(arg1); /* CFArrayRef */
-
-    ALock l(pThis);
-    pThis->updateInfo();
-    pThis->notifyAll();
-}
-
-
-HRESULT HostDnsServiceDarwin::init()
-{
-    SCDynamicStoreContext ctx;
-    RT_ZERO(ctx);
-
-    ctx.info = this;
-
-    g_store = SCDynamicStoreCreate(NULL, CFSTR("org.virtualbox.VBoxSVC"),
-                                   (SCDynamicStoreCallBack)HostDnsServiceDarwin::hostDnsServiceStoreCallback,
-                                   &ctx);
-    AssertReturn(g_store, E_FAIL);
-
-    g_DnsWatcher = SCDynamicStoreCreateRunLoopSource(NULL, g_store, 0);
-    if (!g_DnsWatcher)
-        return E_OUTOFMEMORY;
-
-    HRESULT hrc = HostDnsMonitor::init();
-    AssertComRCReturn(hrc, hrc);
-
-    int rc = RTSemEventCreate(&g_DnsInitEvent);
-    AssertRCReturn(rc, E_FAIL);
-
-    rc = RTThreadCreate(&g_DnsMonitoringThread, hostMonitoringRoutine,
-                        this, 128 * _1K, RTTHREADTYPE_IO, 0, "dns-monitor");
-    AssertRCReturn(rc, E_FAIL);
-
-    RTSemEventWait(g_DnsInitEvent, RT_INDEFINITE_WAIT);
-    return updateInfo();
-}
-
-
 HRESULT HostDnsServiceDarwin::updateInfo()
 {
-    CFPropertyListRef propertyRef = SCDynamicStoreCopyValue(g_store,
+    CFPropertyListRef propertyRef = SCDynamicStoreCopyValue(m->m_store,
                                                             kStateNetworkGlobalDNSKey);
     /**
@@ -216 +249 @@
     return S_OK;
 }
+
+void HostDnsServiceDarwin::Data::performShutdownCallback(void *info)
+{
+    HostDnsServiceDarwin::Data *pThis = static_cast<HostDnsServiceDarwin::Data *>(info);
+    pThis->m_fStop = true;
+}