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

Commit a6cebbe8 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Handle error returned by IBurstContext::freeMemory" am: f3bd4751 am:... 

Merge "Handle error returned by IBurstContext::freeMemory" am: f3bd4751 am: 1b085b37 am: 608210f7 am: 02d3a948 am: 5f9917e6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1856680

Change-Id: I820e3d18f2a3f9d16062bfef4351b7d48cd368ab
parents 8d5adc3c 5f9917e6

neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp

+4 −1
Original line number Diff line number Diff line
@@ -176,7 +176,10 @@ void ExecutionBurstController::MemoryCache::freeMemory(const nn::SharedMemory& m 
        std::lock_guard guard(mMutex);

        const int32_t slot = mMemoryIdToSlot.at(memory);

        if (mBurstContext) {

            mBurstContext->freeMemory(slot);

            const auto ret = mBurstContext->freeMemory(slot);

            if (!ret.isOk()) {

                LOG(ERROR) << "IBustContext::freeMemory failed: " << ret.description();

            }

        }

        mMemoryIdToSlot.erase(memory);

        mMemoryCache[slot] = {};