Changeset 49235 in vbox for trunk/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp

Timestamp:

Oct 22, 2013 6:56:03 PM (11 years ago)

Author:

vboxsync

Message:

Main/HostDnsService: splits HostDnsService on "singleton" HostDnsMonitor
which monitors host changes and share DnsInformation to per HostImpl/VirtualBoxImpl objects
HostDnsMonitorProxy.

TODO: Win/Darwin parts might burn (not tested)
TODO: find good place to call HostDnsMonitor::shutdown() to stop
monitoring thread. (ref counting could be used on
HostDnsMonitor::addMonitorProxy and HostDnsMonitor::releaseMonitorProxy,
but it better to pausing monitoring on no --auto-shutdown launches of VBoxSVC).

File:

• trunk/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp

@@ -26 +26 @@
 #include <iprt/thread.h>
 
-#include "../HostDnsService.h"
-
 #include <errno.h>
 #include <poll.h>
@@ -40 +38 @@
 
 #include <string>
+#include <vector>
+#include "../HostDnsService.h"
+
 
 static RTTHREAD g_DnsMonitoringThread;
@@ -102 +103 @@
 
 
+HostDnsServiceLinux::~HostDnsServiceLinux()
+{
+    send(g_DnsMonitorStop[0], "", 1, 0);
+}
+
+
 int HostDnsServiceLinux::hostMonitoringRoutine(RTTHREAD ThreadSelf, void *pvUser)
 {
@@ -140 +147 @@
         if (polls[0].revents & POLLIN)
         {
-            RTCritSectEnter(&dns->::HostDnsService::m_hCritSect);
-            dns->update();
-            RTCritSectLeave(&dns->::HostDnsService::m_hCritSect);
+            dns->readResolvConf();
+            /* notifyAll() takes required locks */
+            dns->notifyAll();
+
             polls[0].revents = 0;
 
@@ -153 +161 @@
 
 
-HRESULT HostDnsServiceLinux::init(const VirtualBox *aParent)
+HRESULT HostDnsServiceLinux::init(const char *aResolvConfFileName)
 {
-    HRESULT hrc = HostDnsServiceResolvConf::init(aParent);
+    HRESULT hrc = HostDnsServiceResolvConf::init(aResolvConfFileName);
     AssertComRCReturnRC(hrc);
 
@@ -169 +177 @@
     return S_OK;
 }
-
-
-void HostDnsServiceLinux::stop()
-{
-    send(g_DnsMonitorStop[0], "", 1, 0);
-}