Merge "binderRpcTest: cut down a few tests (part I)" (b43fced6) · Commits · e / os / android_frameworks_native

libs/binder/tests/binderRpcTest.cpp

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -439,8 +439,7 @@ TEST_P(BinderRpc, ThreadPoolGreaterThanEqualRequested) {
	for (auto& t : ts) t.join();		for (auto& t : ts) t.join();
	}		}

	static void testThreadPoolOverSaturated(sp<IBinderRpcTest> iface, size_t numCalls,		static void testThreadPoolOverSaturated(sp<IBinderRpcTest> iface, size_t numCalls, size_t sleepMs) {
	size_t sleepMs = 500) {
	size_t epochMsBefore = epochMillis();		size_t epochMsBefore = epochMillis();

	std::vector<std::thread> ts;		std::vector<std::thread> ts;
	@@ -466,7 +465,7 @@ TEST_P(BinderRpc, ThreadPoolOverSaturated) {
	constexpr size_t kNumThreads = 10;		constexpr size_t kNumThreads = 10;
	constexpr size_t kNumCalls = kNumThreads + 3;		constexpr size_t kNumCalls = kNumThreads + 3;
	auto proc = createRpcTestSocketServerProcess({.numThreads = kNumThreads});		auto proc = createRpcTestSocketServerProcess({.numThreads = kNumThreads});
	testThreadPoolOverSaturated(proc.rootIface, kNumCalls);		testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 250 /ms/);
	}		}

	TEST_P(BinderRpc, ThreadPoolLimitOutgoing) {		TEST_P(BinderRpc, ThreadPoolLimitOutgoing) {
	@@ -479,7 +478,7 @@ TEST_P(BinderRpc, ThreadPoolLimitOutgoing) {
	constexpr size_t kNumCalls = kNumOutgoingConnections + 3;		constexpr size_t kNumCalls = kNumOutgoingConnections + 3;
	auto proc = createRpcTestSocketServerProcess(		auto proc = createRpcTestSocketServerProcess(
	{.numThreads = kNumThreads, .numOutgoingConnections = kNumOutgoingConnections});		{.numThreads = kNumThreads, .numOutgoingConnections = kNumOutgoingConnections});
	testThreadPoolOverSaturated(proc.rootIface, kNumCalls);		testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 250 /ms/);
	}		}

	TEST_P(BinderRpc, ThreadingStressTest) {		TEST_P(BinderRpc, ThreadingStressTest) {
	@@ -487,9 +486,9 @@ TEST_P(BinderRpc, ThreadingStressTest) {
	GTEST_SKIP() << "This test requires multiple threads";		GTEST_SKIP() << "This test requires multiple threads";
	}		}

	constexpr size_t kNumClientThreads = 10;		constexpr size_t kNumClientThreads = 5;
	constexpr size_t kNumServerThreads = 10;		constexpr size_t kNumServerThreads = 5;
	constexpr size_t kNumCalls = 100;		constexpr size_t kNumCalls = 50;

	auto proc = createRpcTestSocketServerProcess({.numThreads = kNumServerThreads});		auto proc = createRpcTestSocketServerProcess({.numThreads = kNumServerThreads});