Merge "libhardware_legacy: add trong to OWNERS"
diff --git a/Android.bp b/Android.bp
index 31fd49f..d8c42ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,13 @@
},
}
+cc_test {
+ name: "libpower_test",
+ defaults: ["system_suspend_defaults"],
+ srcs: ["power_test.cpp"],
+ shared_libs: ["libpower"],
+}
+
cc_library_shared {
name: "libhardware_legacy",
defaults: ["system_suspend_defaults"],
diff --git a/power.cpp b/power.cpp
index 2e6d806..c4f2036 100644
--- a/power.cpp
+++ b/power.cpp
@@ -35,14 +35,14 @@
static std::mutex gLock;
static std::unordered_map<std::string, sp<IWakeLock>> gWakeLockMap;
-static sp<ISystemSuspend> getSystemSuspendServiceOnce() {
+static const sp<ISystemSuspend>& getSystemSuspendServiceOnce() {
static sp<ISystemSuspend> suspendService = ISystemSuspend::getService();
return suspendService;
}
int acquire_wake_lock(int, const char* id) {
ATRACE_CALL();
- sp<ISystemSuspend> suspendService = getSystemSuspendServiceOnce();
+ const auto& suspendService = getSystemSuspendServiceOnce();
if (!suspendService) {
return -1;
}
diff --git a/power_test.cpp b/power_test.cpp
new file mode 100644
index 0000000..bb8e97d
--- /dev/null
+++ b/power_test.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018 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 <hardware_legacy/power.h>
+
+#include <string>
+#include <thread>
+#include <vector>
+
+#include <gtest/gtest.h>
+
+namespace android {
+
+// Stress test acquiring/releasing WakeLocks.
+TEST(LibpowerTest, WakeLockStressTest) {
+ // numThreads threads will acquire/release numLocks locks each.
+ constexpr int numThreads = 20;
+ constexpr int numLocks = 10000;
+ std::vector<std::thread> tds;
+
+ for (int i = 0; i < numThreads; i++) {
+ tds.emplace_back([i] {
+ for (int j = 0; j < numLocks; j++) {
+ // We want ids to be unique.
+ std::string id = std::to_string(i) + "/" + std::to_string(j);
+ ASSERT_EQ(acquire_wake_lock(PARTIAL_WAKE_LOCK, id.c_str()), 0);
+ ASSERT_EQ(release_wake_lock(id.c_str()), 0);
+ }
+ });
+ }
+ for (auto& td : tds) {
+ td.join();
+ }
+}
+
+} // namespace android
