commit ede0d538501dfc78c741fb3b0645406636d1d1fd
author Tom Cherry <tomcherry@google.com> Thu Jul 06 14:20:11 2017 -0700
committer Tom Cherry <tomcherry@google.com> Mon Jul 10 09:28:24 2017 -0700
tree 8b00e4bc64471d59a20d762345683721b0214e62
parent c31963b5c255d57e162f4666f80b438ac74413ac

Move Timer from init to libbase

Test: boot bullhead
Test: new libbase unit tests

Change-Id: Ic398a1daa1fe92c10ea7bc1e6ac3f781cee9a5b5

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 6b36526..7a657c8 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -633,10 +633,10 @@
     return (this->*parser)(args, err);
 }
 
-bool Service::ExecStart(std::unique_ptr<Timer>* exec_waiter) {
+bool Service::ExecStart(std::unique_ptr<android::base::Timer>* exec_waiter) {
     flags_ |= SVC_EXEC | SVC_ONESHOT;
 
-    exec_waiter->reset(new Timer);
+    exec_waiter->reset(new android::base::Timer);
 
     if (!Start()) {
         exec_waiter->reset();
@@ -1127,7 +1127,8 @@
     if (svc) {
         name = StringPrintf("Service '%s' (pid %d)", svc->name().c_str(), pid);
         if (svc->flags() & SVC_EXEC) {
-            wait_string = StringPrintf(" waiting took %f seconds", exec_waiter_->duration_s());
+            wait_string = StringPrintf(" waiting took %f seconds",
+                                       exec_waiter_->duration().count() / 1000.0f);
         }
     } else {
         name = StringPrintf("Untracked pid %d", pid);