Track active references in ShillClientHelper (Take 2)

chromeos/dbus/shill_service_client.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_service_client.h"
 
 #include "base/bind.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "chromeos/dbus/shill_service_client_stub.h"
+#include "chromeos/network/network_event_log.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 #ifndef DBUS_ERROR_UNKNOWN_OBJECT
@@ skipping 24 matching lines @@
 
   base::DictionaryValue empty_dictionary;
   callback.Run(DBUS_METHOD_CALL_FAILURE, empty_dictionary);
 }
 
 // The ShillServiceClient implementation.
 class ShillServiceClientImpl : public ShillServiceClient {
  public:
   explicit ShillServiceClientImpl()
       : bus_(NULL),
-        helpers_deleter_(&helpers_) {
+        weak_ptr_factory_(this) {
+  }
+
+  virtual ~ShillServiceClientImpl() {
+    for (HelperMap::iterator iter = helpers_.begin();
+         iter != helpers_.end(); ++iter) {
+      ShillClientHelper* helper = iter->second;
+      bus_->RemoveObjectProxy(shill::kFlimflamServiceName,
+                              helper->object_proxy()->object_path(),
+                              base::Bind(&base::DoNothing));
+      delete helper;
+    }
   }
 
   virtual void AddPropertyChangedObserver(
       const dbus::ObjectPath& service_path,
       ShillPropertyChangedObserver* observer) OVERRIDE {
     GetHelper(service_path)->AddPropertyChangedObserver(observer);
   }
 
   virtual void RemovePropertyChangedObserver(
       const dbus::ObjectPath& service_path,
@@ skipping 147 matching lines @@
  private:
   typedef std::map<std::string, ShillClientHelper*> HelperMap;
 
   // Returns the corresponding ShillClientHelper for the profile.
   ShillClientHelper* GetHelper(const dbus::ObjectPath& service_path) {
     HelperMap::iterator it = helpers_.find(service_path.value());
     if (it != helpers_.end())
       return it->second;
 
     // There is no helper for the profile, create it.
+    NET_LOG_DEBUG("AddShillClientHelper", service_path.value());
     dbus::ObjectProxy* object_proxy =
         bus_->GetObjectProxy(shill::kFlimflamServiceName, service_path);
-    ShillClientHelper* helper = new ShillClientHelper(bus_, object_proxy);
+    ShillClientHelper* helper = new ShillClientHelper(object_proxy);
+    helper->SetReleasedCallback(
+        base::Bind(&ShillServiceClientImpl::NotifyReleased,
+                   weak_ptr_factory_.GetWeakPtr()));
     helper->MonitorPropertyChanged(shill::kFlimflamServiceInterface);
     helpers_.insert(HelperMap::value_type(service_path.value(), helper));
     return helper;
   }
 
+  void NotifyReleased(ShillClientHelper* helper) {
+    // New Shill Service DBus objects are created relatively frequently, so
+    // remove them when they become inactive (no observers and no active method
+    // calls).
+    const dbus::ObjectPath& object_path = helper->object_proxy()->object_path();
+    NET_LOG_DEBUG("RemoveShillClientHelper", object_path.value());
+    bus_->RemoveObjectProxy(shill::kFlimflamServiceName,
+                            object_path, base::Bind(&base::DoNothing));
+    helpers_.erase(object_path.value());
+    delete helper;
+  }
+
   dbus::Bus* bus_;
   HelperMap helpers_;
-  STLValueDeleter<HelperMap> helpers_deleter_;
+  base::WeakPtrFactory<ShillServiceClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillServiceClientImpl);
 };
 
 }  // namespace
 
 ShillServiceClient::ShillServiceClient() {}
 
 ShillServiceClient::~ShillServiceClient() {}
 
 // static
 ShillServiceClient* ShillServiceClient::Create(
     DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillServiceClientImpl();
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillServiceClientStub();
 }
 
 }  // namespace chromeos