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

Commit 3536bf7b authored by Edgar Arriaga's avatar Edgar Arriaga
Browse files

Avoid unnecessary smaps logic during app compaction 



ForEachVma can extract data from both maps and smaps files,
however the smaps logic is not used during app compaction.
Replace its usage with ForEachVmaFromMaps which reads only
maps file and skips any smaps logic.
This results in ~22% CPU usage reduction.

Test: Manual
Bug: 181174877

Signed-off-by: default avatarEdgar Arriaga <edgararriaga@google.com>
Change-Id: I165f211c2084676bc7872d190ffad14141f56ea8
Merged-In: I165f211c2084676bc7872d190ffad14141f56ea8
parent 9a240462

services/core/jni/com_android_server_am_CachedAppOptimizer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int getAnyPageAdvice(const Vma& vma) { 
static int compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) {

    ProcMemInfo meminfo(pid);

    std::vector<Vma> pageoutVmas, coldVmas;

    auto vmaCollectorCb = [&](Vma vma) {

    auto vmaCollectorCb = [&coldVmas,&pageoutVmas,&vmaToAdviseFunc](const Vma& vma) {

        int advice = vmaToAdviseFunc(vma);

        switch (advice) {

            case MADV_COLD:
@@ -146,7 +146,7 @@ static int compactProcess(int pid, VmaToAdviseFunc vmaToAdviseFunc) { 
                break;

        }

    };

    meminfo.ForEachVma(vmaCollectorCb);

    meminfo.ForEachVmaFromMaps(vmaCollectorCb);



    int err = compactMemory(pageoutVmas, pid, MADV_PAGEOUT);

    if (!err) {