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

Commit 32cdb606 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "RPC Binder: disable Nagle's algorithm" am: 942245ea am: e3b1b568... 

Merge "RPC Binder: disable Nagle's algorithm" am: 942245ea am: e3b1b568 am: 6f6d1e90 am: 7b9d7a02

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



Change-Id: Iabaa9d7f2e46a50cbe5fb87036cf8610dd27c2f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac7c9659 7b9d7a02

libs/binder/RpcSession.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#include <dlfcn.h>

#include <dlfcn.h>

#include <inttypes.h>

#include <inttypes.h>

#include <netinet/tcp.h>

#include <poll.h>

#include <poll.h>

#include <unistd.h>

#include <unistd.h>
@@ -608,6 +609,18 @@ status_t RpcSession::setupOneSocketConnection(const RpcSocketAddress& addr, 
            return -savedErrno;

            return -savedErrno;

        }

        }





        if (addr.addr()->sa_family == AF_INET || addr.addr()->sa_family == AF_INET6) {

            int noDelay = 1;

            int result =

                    setsockopt(serverFd.get(), IPPROTO_TCP, TCP_NODELAY, &noDelay, sizeof(noDelay));

            if (result < 0) {

                int savedErrno = errno;

                ALOGE("Could not set TCP_NODELAY on %s: %s", addr.toString().c_str(),

                      strerror(savedErrno));

                return -savedErrno;

            }

        }



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

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





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

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