Shill: Delay the ConnectToSignal call until an observer is added.

chromeos/dbus/shill_client_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/shill_client_helper.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
@@ skipping 17 matching lines @@
 }
 
 ShillClientHelper::~ShillClientHelper() {
   LOG_IF(ERROR, observer_list_.size() != 0u)
       << "ShillClientHelper destroyed with active observers: "
       << observer_list_.size();
 }
 
 void ShillClientHelper::AddPropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
+  // Excecutes all the pending MonitorPropertyChanged calls.
+  for (std::vector<std::string>::iterator it = monitored_interfaces_.begin();
+      it != monitored_interfaces_.end(); ++it) {
+    MonitorPropertyChangedInternal(*it);
+  }
+  monitored_interfaces_.clear();
+
   observer_list_.AddObserver(observer);
 }
 
 void ShillClientHelper::RemovePropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void ShillClientHelper::MonitorPropertyChanged(
     const std::string& interface_name) {
+  if (observer_list_.size() > 0)

[hashimoto, 2013/02/13 04:01:31]

nit: if-statement without curly braces are not allowed for multiple line cases.

[deymo, 2013/02/13 05:41:07]

Done.

+    // Effectively monitor the PropertyChanged now.
+    MonitorPropertyChangedInternal(interface_name);
+  else
+    // Delay the ConnectToSignal until an observer is added.
+    monitored_interfaces_.push_back(interface_name);
+}
+
+void ShillClientHelper::MonitorPropertyChangedInternal(
+    const std::string& interface_name) {
   // We are not using dbus::PropertySet to monitor PropertyChanged signal
   // because the interface is not "org.freedesktop.DBus.Properties".
   proxy_->ConnectToSignal(interface_name,
                           flimflam::kMonitorPropertyChanged,
                           base::Bind(&ShillClientHelper::OnPropertyChanged,
                                      weak_ptr_factory_.GetWeakPtr()),
                           base::Bind(&ShillClientHelper::OnSignalConnected,
                                      weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 279 matching lines @@
   if (response) {
     // Error message may contain the error message as string.
     dbus::MessageReader reader(response);
     error_name = response->GetErrorName();
     reader.PopString(&error_message);
   }
   error_callback.Run(error_name, error_message);
 }
 
 }  // namespace chromeos