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

Commit 1e1204fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: RPC tests - avoid goto" am: e7be9e81 am: 71a0423d am:... 

Merge "libbinder: RPC tests - avoid goto" am: e7be9e81 am: 71a0423d am: 560f8fd5 am: c87cebc4 am: 72316bd9

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

Change-Id: Ib4c94a2c91009d34b47ce0a38cc37a2db339e156
parents 2dcfdc1b 72316bd9

libs/binder/tests/binderRpcBenchmark.cpp

+2 −3
Original line number Diff line number Diff line
@@ -211,10 +211,9 @@ int main(int argc, char** argv) { 
    for (size_t tries = 0; tries < 5; tries++) {

        usleep(10000);

        status = gSession->setupUnixDomainClient(addr.c_str());

        if (status == OK) goto success;

        if (status == OK) break;

    }

    LOG(FATAL) << "Could not connect: " << statusToString(status).c_str();

success:

    CHECK_EQ(status, OK) << "Could not connect: " << statusToString(status).c_str();



    ::benchmark::RunSpecifiedBenchmarks();

    return 0;

libs/binder/tests/binderRpcTest.cpp

+1 −6
Original line number Diff line number Diff line
@@ -615,25 +615,20 @@ public: 
                    status = session->setupPreconnectedClient({}, [=]() {

                        return connectTo(UnixSocketAddress(addr.c_str()));

                    });

                    if (status == OK) goto success;

                    break;

                case SocketType::UNIX:

                    status = session->setupUnixDomainClient(addr.c_str());

                    if (status == OK) goto success;

                    break;

                case SocketType::VSOCK:

                    status = session->setupVsockClient(VMADDR_CID_LOCAL, vsockPort);

                    if (status == OK) goto success;

                    break;

                case SocketType::INET:

                    status = session->setupInetClient("127.0.0.1", serverInfo.port);

                    if (status == OK) goto success;

                    break;

                default:

                    LOG_ALWAYS_FATAL("Unknown socket type");

            }

            LOG_ALWAYS_FATAL("Could not connect %s", statusToString(status).c_str());

        success:

            CHECK_EQ(status, OK) << "Could not connect: " << statusToString(status);

            ret.sessions.push_back({session, session->getRootObject()});

        }

        return ret;

libs/binder/tests/unit_fuzzers/BpBinderFuzz.cpp

+2 −3
Original line number Diff line number Diff line
@@ -54,10 +54,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { 
    for (size_t tries = 0; tries < 5; tries++) {

        usleep(10000);

        status = session->setupUnixDomainClient(addr.c_str());

        if (status == OK) goto success;

        if (status == OK) break;

    }

    LOG(FATAL) << "Unable to connect";

success:

    CHECK_EQ(status, OK) << "Unable to connect";



    sp<BpBinder> bpBinder = session->getRootObject()->remoteBinder();