dbus: allow unregistering of exported objects

dbus/bus.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.
 //
 // TODO(satorux):
 // - Handle "disconnected" signal.
 
 #include "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/stl_util.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "dbus/exported_object.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/scoped_dbus_error.h"
 
 namespace dbus {
 
@@ skipping 218 matching lines @@
     return iter->second;
   }
 
   scoped_refptr<ExportedObject> exported_object =
       new ExportedObject(this, object_path);
   exported_object_table_[object_path] = exported_object;
 
   return exported_object.get();
 }
 
+void Bus::UnregisterExportedObject(const ObjectPath& object_path) {
+  AssertOnOriginThread();
+
+  base::WaitableEvent completion(false, false);
+
+  PostTaskToDBusThread(FROM_HERE, base::Bind(
+      &Bus::UnregisterExportedObjectInternal,
+      this, object_path, &completion));
+
+  completion.Wait();
+}
+
+void Bus::UnregisterExportedObjectInternal(const ObjectPath& object_path,
+                                           base::WaitableEvent* completion) {
+  DCHECK(completion);
+  AssertOnDBusThread();
+
+  // Make sure the requested object exists.
+  ExportedObjectTable::iterator iter = exported_object_table_.find(object_path);
+  if (iter == exported_object_table_.end())
+    return;
+
+  iter->second->Unregister();
+  exported_object_table_.erase(iter);
+
+  completion->Signal();
+}
+
 bool Bus::Connect() {
   // dbus_bus_get_private() and dbus_bus_get() are blocking calls.
   AssertOnDBusThread();
 
   // Check if it's already initialized.
   if (connection_)
     return true;
 
   ScopedDBusError error;
   const DBusBusType dbus_bus_type = static_cast<DBusBusType>(bus_type_);
@@ skipping 526 matching lines @@
 }
 
 void Bus::OnDispatchStatusChangedThunk(DBusConnection* connection,
                                        DBusDispatchStatus status,
                                        void* data) {
   Bus* self = static_cast<Bus*>(data);
   return self->OnDispatchStatusChanged(connection, status);
 }
 
 }  // namespace dbus