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

Commit 74bc589a authored by Devin Moore's avatar Devin Moore
Browse files

Use ProcessState::selfOrNull in ServiceManager APIs 

Allow the APIs to be used when ProcessState isn't initialized.
This allows the use of these APIs in systems like microdroid where there
is no kernel binder driver.

Test: atest vm_accessor_test
Bug: 358427181
Change-Id: Ie981b0ca4335ddc7a5676d30721c01be1ffdf35e
parent dcca938d

libs/binder/BackendUnifiedServiceManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static const char* kStaticCachableList[] = { 
};



bool BinderCacheWithInvalidation::isClientSideCachingEnabled(const std::string& serviceName) {

    if (ProcessState::self()->getThreadPoolMaxTotalThreadCount() <= 0) {

    sp<ProcessState> self = ProcessState::selfOrNull();

    if (!self || self->getThreadPoolMaxTotalThreadCount() <= 0) {

        ALOGW("Thread Pool max thread count is 0. Cannot cache binder as linkToDeath cannot be "

              "implemented. serviceName: %s",

              serviceName.c_str());

libs/binder/IServiceManager.cpp

+7 −4
Original line number Diff line number Diff line
@@ -561,8 +561,9 @@ sp<IBinder> CppBackendShim::getService(const String16& name) const { 
    sp<IBinder> svc = checkService(name);

    if (svc != nullptr) return svc;



    sp<ProcessState> self = ProcessState::selfOrNull();

    const bool isVendorService =

        strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;

            self && strcmp(self->getDriverName().c_str(), "/dev/vndbinder") == 0;

    constexpr auto timeout = 5s;

    const auto startTime = std::chrono::steady_clock::now();

    // Vendor code can't access system properties
@@ -579,7 +580,7 @@ sp<IBinder> CppBackendShim::getService(const String16& name) const { 
    const useconds_t sleepTime = gSystemBootCompleted ? 1000 : 100;



    ALOGI("Waiting for service '%s' on '%s'...", String8(name).c_str(),

          ProcessState::self()->getDriverName().c_str());

          self ? self->getDriverName().c_str() : "RPC accessors only");



    int n = 0;

    while (std::chrono::steady_clock::now() - startTime < timeout) {
@@ -661,7 +662,8 @@ sp<IBinder> CppBackendShim::waitForService(const String16& name16) { 
    if (Status status = realGetService(name, &out); !status.isOk()) {

        ALOGW("Failed to getService in waitForService for %s: %s", name.c_str(),

              status.toString8().c_str());

        if (0 == ProcessState::self()->getThreadPoolMaxTotalThreadCount()) {

        sp<ProcessState> self = ProcessState::selfOrNull();

        if (self && 0 == self->getThreadPoolMaxTotalThreadCount()) {

            ALOGW("Got service, but may be racey because we could not wait efficiently for it. "

                  "Threadpool has 0 guaranteed threads. "

                  "Is the threadpool configured properly? "
@@ -695,9 +697,10 @@ sp<IBinder> CppBackendShim::waitForService(const String16& name16) { 
            if (waiter->mBinder != nullptr) return waiter->mBinder;

        }



        sp<ProcessState> self = ProcessState::selfOrNull();

        ALOGW("Waited one second for %s (is service started? Number of threads started in the "

              "threadpool: %zu. Are binder threads started and available?)",

              name.c_str(), ProcessState::self()->getThreadPoolMaxTotalThreadCount());

              name.c_str(), self ? self->getThreadPoolMaxTotalThreadCount() : 0);



        // Handle race condition for lazy services. Here is what can happen:

        // - the service dies (not processed by init yet).