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

Commit 95c7e19e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: log why we notify lazy services" am: e58d88c6 am: ae226165 

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



Change-Id: I212a48b69329f877e725b264190d11d73680bce4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bbcfe70 ae226165

cmds/servicemanager/ServiceManager.cpp

+17 −9
Original line number Diff line number Diff line
@@ -718,7 +718,8 @@ ssize_t ServiceManager::handleServiceClientCallback(const std::string& serviceNa 
    if (service.guaranteeClient) {

        // we have no record of this client

        if (!service.hasClients && !hasClients) {

            sendClientCallbackNotifications(serviceName, true);

            sendClientCallbackNotifications(serviceName, true,

                                            "service is guaranteed to be in use");

        }



        // guarantee is temporary
@@ -729,34 +730,41 @@ ssize_t ServiceManager::handleServiceClientCallback(const std::string& serviceNa 
    if (isCalledOnInterval) {

        if (hasClients && !service.hasClients) {

            // client was retrieved in some other way

            sendClientCallbackNotifications(serviceName, true);

            sendClientCallbackNotifications(serviceName, true, "we now have a record of a client");

        }



        // there are no more clients, but the callback has not been called yet

        if (!hasClients && service.hasClients) {

            sendClientCallbackNotifications(serviceName, false);

            sendClientCallbackNotifications(serviceName, false,

                                            "we now have no record of a client");

        }

    }



    return count;

}



void ServiceManager::sendClientCallbackNotifications(const std::string& serviceName, bool hasClients) {

void ServiceManager::sendClientCallbackNotifications(const std::string& serviceName,

                                                     bool hasClients, const char* context) {

    auto serviceIt = mNameToService.find(serviceName);

    if (serviceIt == mNameToService.end()) {

        ALOGW("sendClientCallbackNotifications could not find service %s", serviceName.c_str());

        ALOGW("sendClientCallbackNotifications could not find service %s when %s",

              serviceName.c_str(), context);

        return;

    }

    Service& service = serviceIt->second;



    CHECK(hasClients != service.hasClients) << "Record shows: " << service.hasClients

        << " so we can't tell clients again that we have client: " << hasClients;

    CHECK(hasClients != service.hasClients)

            << "Record shows: " << service.hasClients

            << " so we can't tell clients again that we have client: " << hasClients

            << " when: " << context;



    ALOGI("Notifying %s they have clients: %d", serviceName.c_str(), hasClients);

    ALOGI("Notifying %s they %s have clients when %s", serviceName.c_str(),

          hasClients ? "do" : "don't", context);



    auto ccIt = mNameToClientCallback.find(serviceName);

    CHECK(ccIt != mNameToClientCallback.end())

        << "sendClientCallbackNotifications could not find callbacks for service ";

            << "sendClientCallbackNotifications could not find callbacks for service when "

            << context;



    for (const auto& callback : ccIt->second) {

        callback->onClients(service.binder, hasClients);

cmds/servicemanager/ServiceManager.h

+3 −2
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ private: 
                        bool* found);

    ssize_t handleServiceClientCallback(const std::string& serviceName, bool isCalledOnInterval);

    // Also updates mHasClients (of what the last callback was)

    void sendClientCallbackNotifications(const std::string& serviceName, bool hasClients);

    void sendClientCallbackNotifications(const std::string& serviceName, bool hasClients,

                                         const char* context);

    // removes a callback from mNameToClientCallback, deleting the entry if the vector is empty

    // this updates the iterator to the next location

    void removeClientCallback(const wp<IBinder>& who, ClientCallbackMap::iterator* it);