Changeset 72395 in vbox for trunk

Timestamp:

May 30, 2018 10:39:13 PM (7 years ago)

Author:

vboxsync

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

122858

Message:

HostDnsService: don't pretend there can be multiple proxies.
while here, drop some bogus const.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (9 diffs)
• HostDnsService.h (modified) (1 diff)

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

@@ -82 +82 @@
 {
     Data(bool aThreaded)
-      : uLastExtraDataPoll(0),
+      : proxy(NULL),
+        uLastExtraDataPoll(0),
         fLaxComparison(0),
         fThreaded(aThreaded),
@@ -88 +89 @@
     {}
 
-    std::vector<PCHostDnsMonitorProxy> proxies;
+    HostDnsMonitorProxy *proxy;
     HostDnsInformation info;
     uint64_t uLastExtraDataPoll;
@@ -100 +101 @@
 struct HostDnsMonitorProxy::Data
 {
-    Data(const HostDnsMonitor *aMonitor, VirtualBox *aParent)
+    Data(HostDnsMonitor *aMonitor, VirtualBox *aParent)
       : info(NULL)
       , virtualbox(aParent)
@@ -118 +119 @@
     HostDnsInformation *info;
     VirtualBox *virtualbox;
-    const HostDnsMonitor *monitor;
+    HostDnsMonitor *monitor;
     bool fModified;
 };
@@ -138 +139 @@
 }
 
-const HostDnsMonitor *HostDnsMonitor::getHostDnsMonitor(VirtualBox *aParent)
+HostDnsMonitor *HostDnsMonitor::getHostDnsMonitor(VirtualBox *aParent)
 {
     /* XXX: Moved initialization from HostImpl.cpp */
@@ -164 +165 @@
 }
 
-void HostDnsMonitor::addMonitorProxy(PCHostDnsMonitorProxy proxy) const
+void HostDnsMonitor::setMonitorProxy(HostDnsMonitorProxy *proxy)
 {
     RTCLock grab(m_LockMtx);
-    m->proxies.push_back(proxy);
+    Assert(m != NULL && m->proxy == NULL);
+    m->proxy = proxy;
     proxy->notify();
-}
-
-void HostDnsMonitor::releaseMonitorProxy(PCHostDnsMonitorProxy proxy) const
-{
-    RTCLock grab(m_LockMtx);
-    std::vector<PCHostDnsMonitorProxy>::iterator it;
-    it = std::find(m->proxies.begin(), m->proxies.end(), proxy);
-
-    if (it == m->proxies.end())
-        return;
-
-    m->proxies.erase(it);
 }
 
@@ -225 +215 @@
     }
 
-    std::vector<PCHostDnsMonitorProxy>::const_iterator it;
-    for (it = m->proxies.begin(); it != m->proxies.end(); ++it)
-        (*it)->notify();
+    if (m->proxy != NULL)
+        m->proxy->notify();
 }
 
@@ -329 +318 @@
     if (m)
     {
-        if (m->monitor)
-            m->monitor->releaseMonitorProxy(this);
+        /* XXX: m->monitor */
         delete m;
         m = NULL;
@@ -338 +326 @@
 void HostDnsMonitorProxy::init(VirtualBox* aParent)
 {
-    const HostDnsMonitor *mon = HostDnsMonitor::getHostDnsMonitor(aParent);
+    HostDnsMonitor *mon = HostDnsMonitor::getHostDnsMonitor(aParent);
     Assert(mon != NULL);
 
     m = new HostDnsMonitorProxy::Data(mon, aParent);
-    m->monitor->addMonitorProxy(this);
+    m->monitor->setMonitorProxy(this);
     updateInfo();
 }

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

@@ -53 +53 @@
 {
   public:
-    static const HostDnsMonitor *getHostDnsMonitor(VirtualBox *virtualbox);
+    static HostDnsMonitor *getHostDnsMonitor(VirtualBox *virtualbox);
     static void shutdown();
 
-    void addMonitorProxy(PCHostDnsMonitorProxy) const;
-    void releaseMonitorProxy(PCHostDnsMonitorProxy) const;
+    void setMonitorProxy(HostDnsMonitorProxy *proxy);
     const HostDnsInformation &getInfo() const;
     /* @note: method will wait till client call