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

Commit c09e8e79 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "binder: RpcTransport: change to size_t." am: 176a33a2 am: cc00b4f9 am: 9c7441f5 

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

Change-Id: Ibc9ade0e925a1486f42f57725a3b4df8a56a355c
parents 917f2ec6 9c7441f5

libs/binder/RpcState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ status_t RpcState::getAndExecuteCommand(const sp<RpcSession::RpcConnection>& con 
status_t RpcState::drainCommands(const sp<RpcSession::RpcConnection>& connection,

                                 const sp<RpcSession>& session, CommandType type) {

    uint8_t buf;

    while (connection->rpcTransport->peek(&buf, sizeof(buf)).value_or(-1) > 0) {

    while (connection->rpcTransport->peek(&buf, sizeof(buf)).value_or(0) > 0) {

        status_t status = getAndExecuteCommand(connection, session, type);

        if (status != OK) return status;

    }

libs/binder/RpcTransportRaw.cpp

+3 −3
Original line number Diff line number Diff line
@@ -32,21 +32,21 @@ namespace { 
class RpcTransportRaw : public RpcTransport {

public:

    explicit RpcTransportRaw(android::base::unique_fd socket) : mSocket(std::move(socket)) {}

    Result<ssize_t> send(const void *buf, int size) override {

    Result<size_t> send(const void *buf, size_t size) override {

        ssize_t ret = TEMP_FAILURE_RETRY(::send(mSocket.get(), buf, size, MSG_NOSIGNAL));

        if (ret < 0) {

            return ErrnoError() << "send()";

        }

        return ret;

    }

    Result<ssize_t> recv(void *buf, int size) override {

    Result<size_t> recv(void *buf, size_t size) override {

        ssize_t ret = TEMP_FAILURE_RETRY(::recv(mSocket.get(), buf, size, MSG_NOSIGNAL));

        if (ret < 0) {

            return ErrnoError() << "recv()";

        }

        return ret;

    }

    Result<ssize_t> peek(void *buf, int size) override {

    Result<size_t> peek(void *buf, size_t size) override {

        ssize_t ret = TEMP_FAILURE_RETRY(::recv(mSocket.get(), buf, size, MSG_PEEK | MSG_DONTWAIT));

        if (ret < 0) {

            return ErrnoError() << "recv(MSG_PEEK)";

libs/binder/include/binder/RpcTransport.h

+3 −3
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ public: 
    virtual ~RpcTransport() = default;



    // replacement of ::send(). errno may not be set if TLS is enabled.

    virtual android::base::Result<ssize_t> send(const void *buf, int size) = 0;

    virtual android::base::Result<size_t> send(const void *buf, size_t size) = 0;



    // replacement of ::recv(). errno may not be set if TLS is enabled.

    virtual android::base::Result<ssize_t> recv(void *buf, int size) = 0;

    virtual android::base::Result<size_t> recv(void *buf, size_t size) = 0;



    // replacement of ::recv(MSG_PEEK). errno may not be set if TLS is enabled.

    //
@@ -44,7 +44,7 @@ public: 
    // into an internal buffer in userspace. After that, pending() == true.

    // - For raw sockets, this calls ::recv(MSG_PEEK), which leaves the data in the kernel buffer;

    // pending() is always false.

    virtual android::base::Result<ssize_t> peek(void *buf, int size) = 0;

    virtual android::base::Result<size_t> peek(void *buf, size_t size) = 0;



    // Returns true if there are data pending in a userspace buffer that RpcTransport holds.

    //