Changeset 77984 in vbox for trunk/src/VBox/Main/src-server/HostDnsService.cpp

Timestamp:

Apr 2, 2019 2:06:13 PM (6 years ago)

Author:

vboxsync

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

129752

Message:

Main/HostDnsService: Renaming and cleanup (no functional changes).

File:

• trunk/src/VBox/Main/src-server/HostDnsService.cpp (modified) (9 diffs)

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

@@ -78 +78 @@
 }
 
-struct HostDnsMonitor::Data
+struct HostDnsServiceBase::Data
 {
     Data(bool aThreaded)
-      : proxy(NULL),
-        fThreaded(aThreaded)
+        : pProxy(NULL)
+        , fThreaded(aThreaded)
     {}
 
-    HostDnsMonitorProxy *proxy;
-
-    const bool fThreaded;
-    RTSEMEVENT hDnsInitEvent;
-    RTTHREAD hMonitoringThread;
-
-    HostDnsInformation info;
+    /** Weak pointer to parent proxy object. */
+    HostDnsMonitorProxy *pProxy;
+    /** Whether the DNS monitor implementation has a dedicated monitoring thread. Optional. */
+    const bool           fThreaded;
+    /** Event for the monitor thread, if any. */
+    RTSEMEVENT           hMonitorThreadEvent;
+    /** Handle of the monitor thread, if any. */
+    RTTHREAD             hMonitorThread;
+    /** Generic host DNS information. */
+    HostDnsInformation   info;
 };
 
 struct HostDnsMonitorProxy::Data
 {
-    Data(HostDnsMonitor *aMonitor, VirtualBox *aParent)
-      : virtualbox(aParent),
-        monitor(aMonitor),
-        uLastExtraDataPoll(0),
-        fLaxComparison(0),
-        info()
+    Data(HostDnsServiceBase *aMonitor, VirtualBox *aParent)
+        : pVirtualBox(aParent)
+        , pMonitorImpl(aMonitor)
+        , uLastExtraDataPoll(0)
+        , fLaxComparison(0)
+        , info()
     {}
 
-    VirtualBox *virtualbox;
-    HostDnsMonitor *monitor;
+    VirtualBox *pVirtualBox;
+    HostDnsServiceBase *pMonitorImpl;
 
     uint64_t uLastExtraDataPoll;
@@ -113 +116 @@
 
 
-HostDnsMonitor::HostDnsMonitor(bool fThreaded)
-  : m(NULL)
-{
-   m = new HostDnsMonitor::Data(fThreaded);
-}
-
-HostDnsMonitor::~HostDnsMonitor()
+HostDnsServiceBase::HostDnsServiceBase(bool fThreaded)
+    : m(NULL)
+{
+    m = new HostDnsServiceBase::Data(fThreaded);
+}
+
+HostDnsServiceBase::~HostDnsServiceBase()
 {
     if (m)
@@ -128 +131 @@
 }
 
-HostDnsMonitor *HostDnsMonitor::createHostDnsMonitor()
-{
-    HostDnsMonitor *monitor = NULL;
+HostDnsServiceBase *HostDnsServiceBase::createHostDnsMonitor(void)
+{
+    HostDnsServiceBase *pMonitor = NULL;
 
 #if defined (RT_OS_DARWIN)
-    monitor = new HostDnsServiceDarwin();
+    pMonitor = new HostDnsServiceDarwin();
 #elif defined(RT_OS_WINDOWS)
-    monitor = new HostDnsServiceWin();
+    pMonitor = new HostDnsServiceWin();
 #elif defined(RT_OS_LINUX)
-    monitor = new HostDnsServiceLinux();
+    pMonitor = new HostDnsServiceLinux();
 #elif defined(RT_OS_SOLARIS)
-    monitor =  new HostDnsServiceSolaris();
+    pMonitor =  new HostDnsServiceSolaris();
 #elif defined(RT_OS_FREEBSD)
-    monitor = new HostDnsServiceFreebsd();
+    pMonitor = new HostDnsServiceFreebsd();
 #elif defined(RT_OS_OS2)
-    monitor = new HostDnsServiceOs2();
+    pMonitor = new HostDnsServiceOs2();
 #else
-    monitor = new HostDnsService();
+    pMonitor = new HostDnsServiceBase();
 #endif
 
-    return monitor;
-}
-
-
-void HostDnsMonitor::shutdown()
+    return pMonitor;
+}
+
+void HostDnsServiceBase::shutdown(void)
 {
     monitorThreadShutdown();
-    int rc = RTThreadWait(m->hMonitoringThread, 5000, NULL);
+    int rc = RTThreadWait(m->hMonitorThread, 5000, NULL);
     AssertRCSuccess(rc);
 }
 
 
-void HostDnsMonitor::setInfo(const HostDnsInformation &info)
-{
-    if (m->proxy != NULL)
-        m->proxy->notify(info);
-}
-
-HRESULT HostDnsMonitor::init(HostDnsMonitorProxy *proxy)
-{
-    m->proxy = proxy;
+void HostDnsServiceBase::setInfo(const HostDnsInformation &info)
+{
+    if (m->pProxy != NULL)
+        m->pProxy->notify(info);
+}
+
+HRESULT HostDnsServiceBase::init(HostDnsMonitorProxy *pProxy)
+{
+    m->pProxy = pProxy;
 
     if (m->fThreaded)
     {
-        int rc = RTSemEventCreate(&m->hDnsInitEvent);
+        int rc = RTSemEventCreate(&m->hMonitorThreadEvent);
         AssertRCReturn(rc, E_FAIL);
 
-        rc = RTThreadCreate(&m->hMonitoringThread,
-                            HostDnsMonitor::threadMonitoringRoutine,
+        rc = RTThreadCreate(&m->hMonitorThread,
+                            HostDnsServiceBase::threadMonitoringRoutine,
                             this, 128 * _1K, RTTHREADTYPE_IO,
                             RTTHREADFLAGS_WAITABLE, "dns-monitor");
         AssertRCReturn(rc, E_FAIL);
 
-        RTSemEventWait(m->hDnsInitEvent, RT_INDEFINITE_WAIT);
+        RTSemEventWait(m->hMonitorThreadEvent, RT_INDEFINITE_WAIT);
     }
     return S_OK;
 }
 
-
-void HostDnsMonitorProxy::pollGlobalExtraData()
-{
-    VirtualBox *virtualbox = m->virtualbox;
-    if (RT_UNLIKELY(virtualbox == NULL))
+void HostDnsMonitorProxy::pollGlobalExtraData(void)
+{
+    VirtualBox *pVirtualBox = m->pVirtualBox;
+    if (RT_UNLIKELY(pVirtualBox == NULL))
         return;
 
@@ -203 +204 @@
         const com::Bstr bstrHostDNSOrderIgnoreKey("VBoxInternal2/HostDNSOrderIgnore");
         com::Bstr bstrHostDNSOrderIgnore;
-        virtualbox->GetExtraData(bstrHostDNSOrderIgnoreKey.raw(),
+        pVirtualBox->GetExtraData(bstrHostDNSOrderIgnoreKey.raw(),
                                  bstrHostDNSOrderIgnore.asOutParam());
         uint32_t fDNSOrderIgnore = 0;
@@ -226 +227 @@
         const com::Bstr bstrHostDNSSuffixesIgnoreKey("VBoxInternal2/HostDNSSuffixesIgnore");
         com::Bstr bstrHostDNSSuffixesIgnore;
-        virtualbox->GetExtraData(bstrHostDNSSuffixesIgnoreKey.raw(),
+        pVirtualBox->GetExtraData(bstrHostDNSSuffixesIgnoreKey.raw(),
                                  bstrHostDNSSuffixesIgnore.asOutParam());
         uint32_t fDNSSuffixesIgnore = 0;
@@ -246 +247 @@
 }
 
-void HostDnsMonitor::monitorThreadInitializationDone()
-{
-    RTSemEventSignal(m->hDnsInitEvent);
-}
-
-
-DECLCALLBACK(int) HostDnsMonitor::threadMonitoringRoutine(RTTHREAD, void *pvUser)
-{
-    HostDnsMonitor *pThis = static_cast<HostDnsMonitor *>(pvUser);
+void HostDnsServiceBase::monitorThreadInitializationDone(void)
+{
+    RTSemEventSignal(m->hMonitorThreadEvent);
+}
+
+DECLCALLBACK(int) HostDnsServiceBase::threadMonitoringRoutine(RTTHREAD, void *pvUser)
+{
+    HostDnsServiceBase *pThis = static_cast<HostDnsServiceBase *>(pvUser);
     return pThis->monitorWorker();
 }
@@ -271 +271 @@
 void HostDnsMonitorProxy::init(VirtualBox* aParent)
 {
-    HostDnsMonitor *monitor = HostDnsMonitor::createHostDnsMonitor();
-    m = new HostDnsMonitorProxy::Data(monitor, aParent);
-    m->monitor->init(this);
-}
-
-
-void HostDnsMonitorProxy::uninit()
+    HostDnsServiceBase *pMonitor = HostDnsServiceBase::createHostDnsMonitor();
+    m = new HostDnsMonitorProxy::Data(pMonitor, aParent);
+    m->pMonitorImpl->init(this);
+}
+
+void HostDnsMonitorProxy::uninit(void)
 {
     if (m)
     {
-        m->monitor->shutdown();
+        m->pMonitorImpl->shutdown();
         delete m;
         m = NULL;
@@ -291 +290 @@
     bool fNotify = updateInfo(info);
     if (fNotify)
-        m->virtualbox->i_onHostNameResolutionConfigurationChange();
+        m->pVirtualBox->i_onHostNameResolutionConfigurationChange();
 }
 
@@ -362 +361 @@
     return true;
 }
-
 
 static void dumpHostDnsInformation(const HostDnsInformation& info)