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

Commit ca5145ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libtimeinstate: fix bug when cpu count exceeds CPUS_PER_ENTRY" am:... 

Merge "libtimeinstate: fix bug when cpu count exceeds CPUS_PER_ENTRY" am: da12b04e am: 4ed7cdaa am: d80e33de

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



Change-Id: Icdc2c0ec7b5daa72fe3a2bc17ff3bc6e4a3301ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 259f2e9c d80e33de

libs/cputimeinstate/cputimeinstate.cpp

+7 −6
Original line number Diff line number Diff line
@@ -300,11 +300,11 @@ std::optional<std::vector<std::vector<uint64_t>>> getUidCpuFreqTimes(uint32_t ui 
    }



    std::vector<tis_val_t> vals(gNCpus);

    time_key_t key = {.uid = uid};

    for (uint32_t i = 0; i <= (maxFreqCount - 1) / FREQS_PER_ENTRY; ++i) {

        key.bucket = i;

        const time_key_t key = {.uid = uid, .bucket = i};

        if (findMapEntry(gTisMapFd, &key, vals.data())) {

            if (errno != ENOENT || getFirstMapKey(gTisMapFd, &key)) return {};

            time_key_t tmpKey;

            if (errno != ENOENT || getFirstMapKey(gTisMapFd, &tmpKey)) return {};

            continue;

        }
@@ -412,10 +412,11 @@ std::optional<concurrent_time_t> getUidConcurrentTimes(uint32_t uid, bool retry) 
    concurrent_time_t ret = {.active = std::vector<uint64_t>(gNCpus, 0)};

    for (const auto &cpuList : gPolicyCpus) ret.policy.emplace_back(cpuList.size(), 0);

    std::vector<concurrent_val_t> vals(gNCpus);

    time_key_t key = {.uid = uid};

    for (key.bucket = 0; key.bucket <= (gNCpus - 1) / CPUS_PER_ENTRY; ++key.bucket) {

    for (uint32_t i = 0; i <= (gNCpus - 1) / CPUS_PER_ENTRY; ++i) {

        const time_key_t key = {.uid = uid, .bucket = i};

        if (findMapEntry(gConcurrentMapFd, &key, vals.data())) {

            if (errno != ENOENT || getFirstMapKey(gConcurrentMapFd, &key)) return {};

            time_key_t tmpKey;

            if (errno != ENOENT || getFirstMapKey(gConcurrentMapFd, &tmpKey)) return {};

            continue;

        }

        auto offset = key.bucket * CPUS_PER_ENTRY;