Changeset 54302 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 19, 2015 4:53:56 PM (10 years ago)

Author:

vboxsync

Message:

Main/src-server/HostDnsService.cpp: make sure that only actual information changes trigger notifications, as the Windows backend likes to call HostDnsService::notifyAll when nothing changed

Location:

trunk/src/VBox/Main/src-server

Files:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -66 +66 @@
 }
 
+/* HostDnsInformation */
+
+bool HostDnsInformation::equals(const HostDnsInformation &info) const
+{
+    return    (servers == info.servers)
+           && (domain == info.domain)
+           && (searchList == info.searchList);
+}
+
 inline static void detachVectorOfString(const std::vector<std::string>& v,
                                         std::vector<com::Utf8Str> &aArray)
@@ -77 +86 @@
 struct HostDnsMonitor::Data
 {
-    Data(bool aThreaded):fThreaded(aThreaded){}
+    Data(bool aThreaded) :
+        fInfoModified(false),
+        fThreaded(aThreaded)
+    {}
 
     std::vector<PCHostDnsMonitorProxy> proxies;
     HostDnsInformation info;
+    bool fInfoModified;
     const bool fThreaded;
     RTTHREAD hMonitoringThread;
@@ -188 +201 @@
 {
     ALock l(this);
-    std::vector<PCHostDnsMonitorProxy>::const_iterator it;
-    for (it = m->proxies.begin(); it != m->proxies.end(); ++it)
-        (*it)->notify();
+    if (m->fInfoModified)
+    {
+        m->fInfoModified = false;
+        std::vector<PCHostDnsMonitorProxy>::const_iterator it;
+        for (it = m->proxies.begin(); it != m->proxies.end(); ++it)
+            (*it)->notify();
+    }
 }
 
@@ -196 +213 @@
 {
     ALock l(this);
-    m->info = info;
+    // 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;
+    }
 }
 

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

@@ -60 +60 @@
     std::string domain;
     std::vector<std::string> searchList;
+    bool equals(const HostDnsInformation &) const;
 };