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

Commit 9d71de85 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: RPC clear behavior" am: 4d9b036f am: 4abc23f7 

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



Change-Id: If7583fab5d2fa9daeff230063463000d3b7b0fdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1fe2ef49 4abc23f7

libs/binder/RpcState.cpp

+13 −15
Original line number Diff line number Diff line
@@ -244,33 +244,31 @@ void RpcState::clear() { 
                            "New state should be impossible after terminating!");

        return;

    }

    mTerminated = true;



    if (SHOULD_LOG_RPC_DETAIL) {

        ALOGE("RpcState::clear()");

        dumpLocked();

    }



    // if the destructor of a binder object makes another RPC call, then calling

    // decStrong could deadlock. So, we must hold onto these binders until

    // mNodeMutex is no longer taken.

    std::vector<sp<IBinder>> tempHoldBinder;



    mTerminated = true;

    // invariants

    for (auto& [address, node] : mNodeForAddress) {

        sp<IBinder> binder = node.binder.promote();

        LOG_ALWAYS_FATAL_IF(binder == nullptr,

        bool guaranteedHaveBinder = node.timesSent > 0;

        if (guaranteedHaveBinder) {

            LOG_ALWAYS_FATAL_IF(node.sentRef == nullptr,

                                "Binder expected to be owned with address: %" PRIu64 " %s", address,

                                node.toString().c_str());



        if (node.sentRef != nullptr) {

            tempHoldBinder.push_back(node.sentRef);

        }

    }



    mNodeForAddress.clear();

    // if the destructor of a binder object makes another RPC call, then calling

    // decStrong could deadlock. So, we must hold onto these binders until

    // mNodeMutex is no longer taken.

    auto temp = std::move(mNodeForAddress);

    mNodeForAddress.clear(); // RpcState isn't reusable, but for future/explicit



    _l.unlock();

    tempHoldBinder.clear(); // explicit

    temp.clear(); // explicit

}



void RpcState::dumpLocked() {

libs/binder/tests/binderRpcTest.cpp

+0 −7
Original line number Diff line number Diff line
@@ -1029,13 +1029,6 @@ TEST_P(BinderRpc, Callbacks) { 
                // since this session has an incoming connection w/ a threadpool, we

                // need to manually shut it down

                EXPECT_TRUE(proc.proc.sessions.at(0).session->shutdownAndWait(true));



                proc.proc.host.setCustomExitStatusCheck([](int wstatus) {

                    // Flaky. Sometimes gets SIGABRT.

                    EXPECT_TRUE((WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0) ||

                                (WIFSIGNALED(wstatus) && WTERMSIG(wstatus) == SIGABRT))

                            << "server process failed: " << WaitStatusToString(wstatus);

                });

                proc.expectAlreadyShutdown = true;

            }

        }