Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81a1e50f authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: cut down a few tests (part I)" am: b43fced6 am:... 

Merge "binderRpcTest: cut down a few tests (part I)" am: b43fced6 am: 12f72573 am: 634dec79 am: 7912dda8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2471759



Change-Id: I0426e9407a77e2b14027e8cbc5a06d1519b5a69d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c18ea184 7912dda8

libs/binder/tests/binderRpcTest.cpp

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

}



static void testThreadPoolOverSaturated(sp<IBinderRpcTest> iface, size_t numCalls,

                                        size_t sleepMs = 500) {

static void testThreadPoolOverSaturated(sp<IBinderRpcTest> iface, size_t numCalls, size_t sleepMs) {

    size_t epochMsBefore = epochMillis();



    std::vector<std::thread> ts;
@@ -466,7 +465,7 @@ TEST_P(BinderRpc, ThreadPoolOverSaturated) { 
    constexpr size_t kNumThreads = 10;

    constexpr size_t kNumCalls = kNumThreads + 3;

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

    testThreadPoolOverSaturated(proc.rootIface, kNumCalls);

    testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 250 /*ms*/);

}



TEST_P(BinderRpc, ThreadPoolLimitOutgoing) {
@@ -479,7 +478,7 @@ TEST_P(BinderRpc, ThreadPoolLimitOutgoing) { 
    constexpr size_t kNumCalls = kNumOutgoingConnections + 3;

    auto proc = createRpcTestSocketServerProcess(

            {.numThreads = kNumThreads, .numOutgoingConnections = kNumOutgoingConnections});

    testThreadPoolOverSaturated(proc.rootIface, kNumCalls);

    testThreadPoolOverSaturated(proc.rootIface, kNumCalls, 250 /*ms*/);

}



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

    }



    constexpr size_t kNumClientThreads = 10;

    constexpr size_t kNumServerThreads = 10;

    constexpr size_t kNumCalls = 100;

    constexpr size_t kNumClientThreads = 5;

    constexpr size_t kNumServerThreads = 5;

    constexpr size_t kNumCalls = 50;



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