Revert "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."
This reverts commit 7c92e484503f239000ef97ef5b067907fbeaa4a6.
Mac sdk still broken (despite testing locally).
Change-Id: I7d9206e15997cd0efe081bd3fa17d53d2b20ec32
diff --git a/base/Android.bp b/base/Android.bp
index 7f81915..b9a6e0b 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -42,32 +42,21 @@
srcs: [
"errors_unix.cpp",
"properties.cpp",
- "chrono_utils.cpp",
],
cppflags: ["-Wexit-time-destructors"],
},
darwin: {
- srcs: [
- "chrono_utils.cpp",
- "errors_unix.cpp",
- ],
+ srcs: ["errors_unix.cpp"],
cppflags: ["-Wexit-time-destructors"],
},
linux_bionic: {
- srcs: [
- "chrono_utils.cpp",
- "errors_unix.cpp",
- ],
+ srcs: ["errors_unix.cpp"],
cppflags: ["-Wexit-time-destructors"],
enabled: true,
},
linux: {
- srcs: [
- "chrono_utils.cpp",
- "errors_unix.cpp",
- ],
+ srcs: ["errors_unix.cpp"],
cppflags: ["-Wexit-time-destructors"],
- host_ldlibs: ["-lrt"],
},
windows: {
srcs: [
@@ -99,14 +88,7 @@
],
target: {
android: {
- srcs: [
- "chrono_utils_test.cpp",
- "properties_test.cpp"
- ],
- },
- linux: {
- srcs: ["chrono_utils_test.cpp"],
- host_ldlibs: ["-lrt"],
+ srcs: ["properties_test.cpp"],
},
windows: {
srcs: ["utf8_test.cpp"],
diff --git a/base/chrono_utils.cpp b/base/chrono_utils.cpp
deleted file mode 100644
index 644fd28..0000000
--- a/base/chrono_utils.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "android-base/chrono_utils.h"
-
-#include <time.h>
-
-namespace android {
-namespace base {
-
-boot_clock::time_point boot_clock::now() {
- timespec ts;
- clockid_t clk_id;
-
-#ifdef __ANDROID__
- clk_id = CLOCK_BOOTTIME;
-#else
- // Darwin does not support CLOCK_BOOTTIME. CLOCK_MONOTONIC is a sufficient
- // fallback; the only loss of precision is the time duration when the system
- // is suspended.
- clk_id = CLOCK_MONOTONIC;
-#endif // __ANDROID__
-
- clock_gettime(clk_id, &ts);
- return boot_clock::time_point(std::chrono::seconds(ts.tv_sec) +
- std::chrono::nanoseconds(ts.tv_nsec));
-}
-
-} // namespace base
-} // namespace android
diff --git a/base/chrono_utils_test.cpp b/base/chrono_utils_test.cpp
deleted file mode 100644
index bc6df4b..0000000
--- a/base/chrono_utils_test.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "android-base/chrono_utils.h"
-
-#include <time.h>
-
-#include <chrono>
-
-#include <gtest/gtest.h>
-
-namespace android {
-namespace base {
-
-std::chrono::seconds GetBootTimeSeconds() {
- struct timespec now;
- clock_gettime(CLOCK_BOOTTIME, &now);
-
- auto now_tp = boot_clock::time_point(
- std::chrono::seconds(now.tv_sec) + std::chrono::nanoseconds(now.tv_nsec));
- return std::chrono::duration_cast<std::chrono::seconds>(
- now_tp.time_since_epoch());
-}
-
-// Tests (at least) the seconds accuracy of the boot_clock::now() method.
-TEST(ChronoUtilsTest, BootClockNowSeconds) {
- auto now = GetBootTimeSeconds();
- auto boot_seconds = std::chrono::duration_cast<std::chrono::seconds>(
- boot_clock::now().time_since_epoch());
- EXPECT_EQ(now, boot_seconds);
-}
-
-} // namespace base
-} // namespace android
\ No newline at end of file
diff --git a/base/include/android-base/chrono_utils.h b/base/include/android-base/chrono_utils.h
deleted file mode 100644
index 0086425..0000000
--- a/base/include/android-base/chrono_utils.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_BASE_CHRONO_UTILS_H
-#define ANDROID_BASE_CHRONO_UTILS_H
-
-#include <chrono>
-
-namespace android {
-namespace base {
-
-// A std::chrono clock based on CLOCK_BOOTTIME.
-class boot_clock {
- public:
- typedef std::chrono::nanoseconds duration;
- typedef std::chrono::time_point<boot_clock, duration> time_point;
-
- static time_point now();
-};
-
-} // namespace base
-} // namespace android
-
-#endif // ANDROID_BASE_CHRONO_UTILS_H