Loading libs/binder/tests/binderLibTest.cpp +4 −11 Original line number Diff line number Diff line Loading @@ -43,6 +43,7 @@ #include <input/BlockingQueue.h> #include <processgroup/processgroup.h> #include <utils/Flattenable.h> #include <utils/SystemClock.h> #include <linux/sched.h> #include <sys/epoll.h> Loading Loading @@ -1716,14 +1717,6 @@ TEST_F(BinderLibTest, ThreadPoolStarted) { EXPECT_TRUE(reply.readBool()); } size_t epochMillis() { using std::chrono::duration_cast; using std::chrono::milliseconds; using std::chrono::seconds; using std::chrono::system_clock; return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count(); } TEST_F(BinderLibTest, HangingServices) { Parcel data, reply; sp<IBinder> server = addServer(); Loading @@ -1732,7 +1725,7 @@ TEST_F(BinderLibTest, HangingServices) { data.writeInt32(delay); // b/266537959 - must take before taking lock, since countdown is started in the remote // process there. size_t epochMsBefore = epochMillis(); int64_t timeBefore = uptimeMillis(); EXPECT_THAT(server->transact(BINDER_LIB_TEST_PROCESS_TEMPORARY_LOCK, data, &reply), NO_ERROR); std::vector<std::thread> ts; for (size_t i = 0; i < kKernelThreads + 1; i++) { Loading @@ -1746,10 +1739,10 @@ TEST_F(BinderLibTest, HangingServices) { for (auto &t : ts) { t.join(); } size_t epochMsAfter = epochMillis(); int64_t timeAfter = uptimeMillis(); // deadlock occurred and threads only finished after 1s passed. EXPECT_GE(epochMsAfter, epochMsBefore + delay); EXPECT_GE(timeAfter, timeBefore + delay); } TEST_F(BinderLibTest, BinderProxyCount) { Loading Loading
libs/binder/tests/binderLibTest.cpp +4 −11 Original line number Diff line number Diff line Loading @@ -43,6 +43,7 @@ #include <input/BlockingQueue.h> #include <processgroup/processgroup.h> #include <utils/Flattenable.h> #include <utils/SystemClock.h> #include <linux/sched.h> #include <sys/epoll.h> Loading Loading @@ -1716,14 +1717,6 @@ TEST_F(BinderLibTest, ThreadPoolStarted) { EXPECT_TRUE(reply.readBool()); } size_t epochMillis() { using std::chrono::duration_cast; using std::chrono::milliseconds; using std::chrono::seconds; using std::chrono::system_clock; return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count(); } TEST_F(BinderLibTest, HangingServices) { Parcel data, reply; sp<IBinder> server = addServer(); Loading @@ -1732,7 +1725,7 @@ TEST_F(BinderLibTest, HangingServices) { data.writeInt32(delay); // b/266537959 - must take before taking lock, since countdown is started in the remote // process there. size_t epochMsBefore = epochMillis(); int64_t timeBefore = uptimeMillis(); EXPECT_THAT(server->transact(BINDER_LIB_TEST_PROCESS_TEMPORARY_LOCK, data, &reply), NO_ERROR); std::vector<std::thread> ts; for (size_t i = 0; i < kKernelThreads + 1; i++) { Loading @@ -1746,10 +1739,10 @@ TEST_F(BinderLibTest, HangingServices) { for (auto &t : ts) { t.join(); } size_t epochMsAfter = epochMillis(); int64_t timeAfter = uptimeMillis(); // deadlock occurred and threads only finished after 1s passed. EXPECT_GE(epochMsAfter, epochMsBefore + delay); EXPECT_GE(timeAfter, timeBefore + delay); } TEST_F(BinderLibTest, BinderProxyCount) { Loading