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

Timestamp:

Apr 3, 2019 3:11:36 PM (6 years ago)

Author:

vboxsync

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

129765

Message:

Main/HostDnsService: Some more cleanup and renaming.

File:

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

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

@@ -131 +131 @@
 }
 
+/* static */
 HostDnsServiceBase *HostDnsServiceBase::createHostDnsMonitor(void)
 {
@@ -154 +155 @@
 }
 
-void HostDnsServiceBase::shutdown(void)
-{
-    monitorThreadShutdown();
-    int rc = RTThreadWait(m->hMonitorThread, 5000, NULL);
-    AssertRCSuccess(rc);
-}
-
-
-void HostDnsServiceBase::setInfo(const HostDnsInformation &info)
-{
-    if (m->pProxy != NULL)
-        m->pProxy->notify(info);
-}
-
 HRESULT HostDnsServiceBase::init(HostDnsMonitorProxy *pProxy)
 {
+    LogRel(("HostDnsMonitor: initializing\n"));
+
+    AssertPtrReturn(pProxy, E_POINTER);
     m->pProxy = pProxy;
 
     if (m->fThreaded)
     {
+        LogRel2(("HostDnsMonitor: starting thread ...\n"));
+
         int rc = RTSemEventCreate(&m->hMonitorThreadEvent);
         AssertRCReturn(rc, E_FAIL);
 
         rc = RTThreadCreate(&m->hMonitorThread,
-                            HostDnsServiceBase::threadMonitoringRoutine,
+                            HostDnsServiceBase::threadMonitorProc,
                             this, 128 * _1K, RTTHREADTYPE_IO,
                             RTTHREADFLAGS_WAITABLE, "dns-monitor");
@@ -184 +176 @@
 
         RTSemEventWait(m->hMonitorThreadEvent, RT_INDEFINITE_WAIT);
-    }
+
+        LogRel2(("HostDnsMonitor: thread started\n"));
+    }
+
     return S_OK;
+}
+
+void HostDnsServiceBase::uninit(void)
+{
+    LogRel(("HostDnsMonitor: shutting down ...\n"));
+
+    if (m->fThreaded)
+    {
+        LogRel2(("HostDnsMonitor: waiting for thread ...\n"));
+
+        const RTMSINTERVAL uTimeoutMs = 30 * 1000; /* 30s */
+
+        monitorThreadShutdown(uTimeoutMs);
+
+        int rc = RTThreadWait(m->hMonitorThread, uTimeoutMs, NULL);
+        if (RT_FAILURE(rc))
+            LogRel(("HostDnsMonitor: waiting for thread failed with rc=%Rrc\n", rc));
+    }
+
+    LogRel(("HostDnsMonitor: shut down\n"));
+}
+
+void HostDnsServiceBase::setInfo(const HostDnsInformation &info)
+{
+    if (m->pProxy != NULL)
+        m->pProxy->notify(info);
 }
 
@@ -247 +268 @@
 }
 
-void HostDnsServiceBase::monitorThreadInitializationDone(void)
-{
+void HostDnsServiceBase::onMonitorThreadInitDone(void)
+{
+    if (!m->fThreaded) /* If non-threaded, bail out, nothing to do here. */
+        return;
+
     RTSemEventSignal(m->hMonitorThreadEvent);
 }
 
-DECLCALLBACK(int) HostDnsServiceBase::threadMonitoringRoutine(RTTHREAD, void *pvUser)
+DECLCALLBACK(int) HostDnsServiceBase::threadMonitorProc(RTTHREAD, void *pvUser)
 {
     HostDnsServiceBase *pThis = static_cast<HostDnsServiceBase *>(pvUser);
-    return pThis->monitorWorker();
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    return pThis->monitorThreadProc();
 }
 
 /* HostDnsMonitorProxy */
 HostDnsMonitorProxy::HostDnsMonitorProxy()
-  : m(NULL)
+    : m(NULL)
 {
 }
@@ -266 +291 @@
 HostDnsMonitorProxy::~HostDnsMonitorProxy()
 {
-    Assert(!m);
-}
-
-void HostDnsMonitorProxy::init(VirtualBox* aParent)
-{
-    HostDnsServiceBase *pMonitor = HostDnsServiceBase::createHostDnsMonitor();
-    m = new HostDnsMonitorProxy::Data(pMonitor, aParent);
-    m->pMonitorImpl->init(this);
+    uninit();
+}
+
+HRESULT HostDnsMonitorProxy::init(VirtualBox* aParent)
+{
+    AssertMsgReturn(m == NULL, ("DNS monitor proxy already initialized\n"), E_FAIL);
+
+    HostDnsServiceBase *pMonitorImpl = HostDnsServiceBase::createHostDnsMonitor();
+    AssertPtrReturn(pMonitorImpl, E_OUTOFMEMORY);
+
+    Assert(m == NULL); /* Paranoia. */
+    m = new HostDnsMonitorProxy::Data(pMonitorImpl, aParent);
+    AssertPtrReturn(m, E_OUTOFMEMORY);
+
+    return m->pMonitorImpl->init(this);
 }
 
@@ -280 +312 @@
     if (m)
     {
-        m->pMonitorImpl->shutdown();
+        m->pMonitorImpl->uninit();
+
         delete m;
         m = NULL;
@@ -288 +321 @@
 void HostDnsMonitorProxy::notify(const HostDnsInformation &info)
 {
-    bool fNotify = updateInfo(info);
+    const bool fNotify = updateInfo(info);
     if (fNotify)
         m->pVirtualBox->i_onHostNameResolutionConfigurationChange();
@@ -334 +367 @@
 bool HostDnsMonitorProxy::updateInfo(const HostDnsInformation &info)
 {
-    LogRel(("HostDnsMonitor::updateInfo\n"));
+    LogRel(("HostDnsMonitor: updating information\n"));
     RTCLock grab(m_LockMtx);