commit eeee83106bfbd719b52817c2ebb460ce38bcc494
author Tom Cherry <tomcherry@google.com> Fri Jul 28 15:22:23 2017 -0700
committer Tom Cherry <tomcherry@google.com> Tue Aug 01 11:06:17 2017 -0700
tree 013d9a9b84965237f67d43a732027413e8918053
parent 3b81f2d623c6cba45ad07fa91338d346d9b96482

init: move reaping from ServiceManager to signal_handler.cpp

signal_handler.cpp itself needs to be cleaned up, but this is a step
to clean up ServiceManager.

Test: boot bullhead
Change-Id: I81f1e8ac4d09692cfb364bc702cbd3deb61aa55a

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 6002040..b1cde93 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -53,6 +53,7 @@
 #include "init.h"
 #include "property_service.h"
 #include "service.h"
+#include "signal_handler.h"
 
 using android::base::StringPrintf;
 using android::base::Timer;
@@ -406,7 +407,7 @@
         // Only wait up to half of timeout here
         auto termination_wait_timeout = shutdown_timeout / 2;
         while (t.duration() < termination_wait_timeout) {
-            ServiceManager::GetInstance().ReapAnyOutstandingChildren();
+            ReapAnyOutstandingChildren();
 
             service_count = 0;
             ServiceManager::GetInstance().ForEachService([&service_count](Service* s) {
@@ -437,7 +438,7 @@
     ServiceManager::GetInstance().ForEachServiceShutdownOrder([](Service* s) {
         if (!s->IsShutdownCritical()) s->Stop();
     });
-    ServiceManager::GetInstance().ReapAnyOutstandingChildren();
+    ReapAnyOutstandingChildren();
 
     // 3. send volume shutdown to vold
     Service* voldService = ServiceManager::GetInstance().FindServiceByName("vold");