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

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

Merge "[rpc_binder] Reuse raw socket setup method in vsock/uds sockets setup" am: aea36f0d 

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



Change-Id: I2145f8e9fc0ac82eb3f1ace432c52cb16dfb2e52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 901b2e1a aea36f0d

libs/binder/RpcServer.cpp

+6 −23
Original line number Original line Diff line number Diff line
@@ -531,40 +531,23 @@ status_t RpcServer::setupSocketServer(const RpcSocketAddress& addr) { 
    LOG_RPC_DETAIL("Setting up socket server %s", addr.toString().c_str());

    LOG_RPC_DETAIL("Setting up socket server %s", addr.toString().c_str());

    LOG_ALWAYS_FATAL_IF(hasServer(), "Each RpcServer can only have one server.");

    LOG_ALWAYS_FATAL_IF(hasServer(), "Each RpcServer can only have one server.");





    RpcTransportFd transportFd(unique_fd(TEMP_FAILURE_RETRY(

    unique_fd socket_fd(TEMP_FAILURE_RETRY(

            socket(addr.addr()->sa_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0))));

            socket(addr.addr()->sa_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)));

    if (!transportFd.fd.ok()) {

    if (!socket_fd.ok()) {

        int savedErrno = errno;

        int savedErrno = errno;

        ALOGE("Could not create socket: %s", strerror(savedErrno));

        ALOGE("Could not create socket: %s", strerror(savedErrno));

        return -savedErrno;

        return -savedErrno;

    }

    }



    if (0 != TEMP_FAILURE_RETRY(bind(socket_fd.get(), addr.addr(), addr.addrSize()))) {

    if (0 != TEMP_FAILURE_RETRY(bind(transportFd.fd.get(), addr.addr(), addr.addrSize()))) {

        int savedErrno = errno;

        int savedErrno = errno;

        ALOGE("Could not bind socket at %s: %s", addr.toString().c_str(), strerror(savedErrno));

        ALOGE("Could not bind socket at %s: %s", addr.toString().c_str(), strerror(savedErrno));

        return -savedErrno;

        return -savedErrno;

    }

    }





    // Right now, we create all threads at once, making accept4 slow. To avoid hanging the client,

    return setupRawSocketServer(std::move(socket_fd));

    // the backlog is increased to a large number.

    // TODO(b/189955605): Once we create threads dynamically & lazily, the backlog can be reduced

    //  to 1.

    if (0 != TEMP_FAILURE_RETRY(listen(transportFd.fd.get(), 50 /*backlog*/))) {

        int savedErrno = errno;

        ALOGE("Could not listen socket at %s: %s", addr.toString().c_str(), strerror(savedErrno));

        return -savedErrno;

    }



    LOG_RPC_DETAIL("Successfully setup socket server %s", addr.toString().c_str());



    if (status_t status = setupExternalServer(std::move(transportFd.fd)); status != OK) {

        ALOGE("Another thread has set up server while calling setupSocketServer. Race?");

        return status;

    }

    return OK;

}

}





status_t RpcServer::setupRawSocketServer(base::unique_fd socket_fd) {

status_t RpcServer::setupRawSocketServer(unique_fd socket_fd) {

    LOG_ALWAYS_FATAL_IF(!socket_fd.ok(), "Socket must be setup to listen.");

    LOG_ALWAYS_FATAL_IF(!socket_fd.ok(), "Socket must be setup to listen.");

    RpcTransportFd transportFd(std::move(socket_fd));

    RpcTransportFd transportFd(std::move(socket_fd));