Changeset 54662 in vbox for trunk/src

Timestamp:

Mar 6, 2015 5:29:44 AM (10 years ago)

Author:

vboxsync

Message:

Main/HostDnsService: instead of keeping fragile state g/c notifyAll()
and just notify proxy directly from setInfo() when info changed.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostDnsService.cpp (modified) (3 diffs)
• HostDnsService.h (modified) (1 diff)
• darwin/HostDnsServiceDarwin.cpp (modified) (1 diff)
• linux/HostDnsServiceLinux.cpp (modified) (2 diffs)
• win/HostDnsServiceWin.cpp (modified) (1 diff)

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

@@ -87 +87 @@
 {
     Data(bool aThreaded) :
-        fInfoModified(false),
         fThreaded(aThreaded)
     {}
@@ -93 +92 @@
     std::vector<PCHostDnsMonitorProxy> proxies;
     HostDnsInformation info;
-    bool fInfoModified;
     const bool fThreaded;
     RTTHREAD hMonitoringThread;
@@ -198 +196 @@
 }
 
-void HostDnsMonitor::notifyAll() const
-{
-    ALock l(this);
-    if (m->fInfoModified)
-    {
-        m->fInfoModified = false;
-        std::vector<PCHostDnsMonitorProxy>::const_iterator it;
-        for (it = m->proxies.begin(); it != m->proxies.end(); ++it)
-            (*it)->notify();
-    }
-}
-
 void HostDnsMonitor::setInfo(const HostDnsInformation &info)
 {
     ALock l(this);
-    // Check for actual modifications, as the Windows specific code seems to
-    // often set the same information as before, without any change to the
-    // previous state. Here we have the previous state, so make sure we don't
-    // ever tell our clients about unchanged info.
-    if (!info.equals(m->info))
-    {
-        m->info = info;
-        m->fInfoModified = true;
-    }
+
+    if (info.equals(m->info))
+        return;
+
+    m->info = info;
+
+    std::vector<PCHostDnsMonitorProxy>::const_iterator it;
+    for (it = m->proxies.begin(); it != m->proxies.end(); ++it)
+        (*it)->notify();
 }
 

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

@@ -84 +84 @@
     virtual ~HostDnsMonitor();
 
-    void notifyAll() const;
     void setInfo(const HostDnsInformation &);
 

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

@@ -79 +79 @@
     ALock l(pThis);
     pThis->updateInfo();
-    pThis->notifyAll();
 }
 

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

@@ -153 +153 @@
                 {
                     readResolvConf();
-                    /* notifyAll() takes required locks */
-                    notifyAll();
                 }
                 else if (combo.e.mask & IN_DELETE_SELF)
@@ -214 +212 @@
                         /* Notify our listeners */
                         readResolvConf();
-                        notifyAll();
-
                     }
                 }

trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

@@ -157 +157 @@
         {
             updateInfo();
-            notifyAll();
 
             ResetEvent(m->haDataEvent[DATA_DNS_UPDATE_EVENT]);