Revert "cashew: do not delete DBus::ObjectProxy objects from D-Bus callbacks"

src/main.cc

 // Copyright (c) 2010 The Chromium OS 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 <config.h>
 
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 29 matching lines @@
 }
 
 static DBus::Glib::BusDispatcher *dispatcher = NULL;
 static GMainLoop *main_loop = NULL;
 static CashewServer *server = NULL;
 static ServiceManager *service_manager = NULL;
 
 static void OnSignal(int signal) {
   DLOG(INFO) << "received signal " << signal;
   if (main_loop != NULL) {
-    // TODO(vlaviano): g_idle_add a callback to quit the main loop instead of
-    // doing it directly here to remove some low severity races
     g_main_loop_quit(main_loop);
   }
 }
 
 int InstallSignalHandlers() {
   sigset_t mask;
   if (sigemptyset(&mask) < 0) {
     PLOG(ERROR) << "sigemptyset failed";
     return -1;
   }
@@ skipping 11 matching lines @@
   }
   if (InstallSignalHandler(SIGTERM, OnSignal, mask) < 0) {
     PLOG(ERROR) << "couldn't install SIGTERM handler";
     return -1;
   }
   return 0;
 }
 
 // should not be called while event loop is running
 static void CleanUpForExit() {
-  DCHECK(main_loop == NULL || !g_main_loop_is_running(main_loop));
   DLOG(INFO) << "cleaning up";
   delete server;
   server = NULL;
   delete service_manager;
   service_manager = NULL;
   DBus::default_dispatcher = NULL;
   delete dispatcher;
   dispatcher = NULL;
   if (main_loop != NULL) {
     g_main_loop_unref(main_loop);
@@ skipping 27 matching lines @@
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
   DBus::default_dispatcher = cashew::dispatcher;
   cashew::dispatcher->attach(NULL);
 
   DLOG(INFO) << "creating service manager";
   DBus::Connection client_conn = DBus::Connection::SystemBus();
   client_conn.set_timeout(cashew::kDBusConnectionTimeoutMilliseconds);
   cashew::service_manager = new(std::nothrow) cashew::ServiceManager(
-      client_conn, cashew::main_loop);
+      client_conn);
   if (cashew::service_manager == NULL) {
     LOG(ERROR) << "couldn't create service manager";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   DLOG(INFO) << "creating cashew server";
   // TODO(vlaviano): can we share a single conn for client and server roles?
   DBus::Connection server_conn = DBus::Connection::SystemBus();
   server_conn.request_name(cashew::CashewServer::kServiceName);
   server_conn.set_timeout(cashew::kDBusConnectionTimeoutMilliseconds);
   cashew::server = new(std::nothrow) cashew::CashewServer(server_conn,
-      cashew::service_manager, cashew::main_loop);
+      cashew::service_manager);
   if (cashew::server == NULL) {
     LOG(ERROR) << "couldn't create cashew server";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   if (cashew::InstallSignalHandlers() < 0) {
     LOG(ERROR) << "couldn't install signal handlers";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   DLOG(INFO) << "entering event loop";
   g_main_loop_run(cashew::main_loop);
   DLOG(INFO) << "exited event loop";
   cashew::CleanUpForExit();
   exit(EXIT_SUCCESS);
 }