Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."

This reverts commit 26f40c04c3ad80e2bc449990010d39d1c1b9a5f0.

This change broke the Darwin SDK target.

Test: none
Change-Id: Ia54fe2c31da8d8fa2825e023b035fb8321dcd457

1 files changed, 5 insertions, 12 deletions

diff --git a/init/util.cpp b/init/util.cpp
index f59ba82e1..888a36652 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -51,8 +51,6 @@
 #include "property_service.h"
 #include "util.h"
 
-using android::base::boot_clock;
-
 static unsigned int do_decode_uid(const char *s)
 {
     unsigned int v;
@@ -201,16 +199,11 @@ bool write_file(const char* path, const char* content) {
     return success;
 }
 
-Timer::Timer() : start_(boot_clock::now()) {
-}
-
-double Timer::duration_s() const {
-  typedef std::chrono::duration<double> double_duration;
-  return std::chrono::duration_cast<double_duration>(boot_clock::now() - start_).count();
-}
-
-int64_t Timer::duration_ms() const {
-  return std::chrono::duration_cast<std::chrono::milliseconds>(boot_clock::now() - start_).count();
+boot_clock::time_point boot_clock::now() {
+  timespec ts;
+  clock_gettime(CLOCK_BOOTTIME, &ts);
+  return boot_clock::time_point(std::chrono::seconds(ts.tv_sec) +
+                                std::chrono::nanoseconds(ts.tv_nsec));
 }
 
 int mkdir_recursive(const char *pathname, mode_t mode)