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

Commit 43c6c844 authored by Robert Benea's avatar Robert Benea Committed by android-build-merger
Browse files

Merge "Use mem cgroups in libprocessgroup if they're available" am: 3c7f5664 

am: 92ad7c02

Change-Id: I08d156810741228e30aa0d4fb8f981c1ecb447f4
parents 06386fe0 92ad7c02

libprocessgroup/processgroup.cpp

+0 −7
Original line number Original line Diff line number Diff line
@@ -43,9 +43,6 @@ 




using namespace std::chrono_literals;

using namespace std::chrono_literals;





// Uncomment line below use memory cgroups for keeping track of (forked) PIDs

// #define USE_MEMCG 1



#define MEM_CGROUP_PATH "/dev/memcg/apps"

#define MEM_CGROUP_PATH "/dev/memcg/apps"

#define MEM_CGROUP_TASKS "/dev/memcg/apps/tasks"

#define MEM_CGROUP_TASKS "/dev/memcg/apps/tasks"

#define ACCT_CGROUP_PATH "/acct"

#define ACCT_CGROUP_PATH "/acct"
@@ -91,7 +88,6 @@ class ProcessGroup { 
};

};





static const char* getCgroupRootPath() {

static const char* getCgroupRootPath() {

#ifdef USE_MEMCG

    static const char* cgroup_root_path = NULL;

    static const char* cgroup_root_path = NULL;

    std::call_once(init_path_flag, [&]() {

    std::call_once(init_path_flag, [&]() {

            // Check if mem cgroup is mounted, only then check for write-access to avoid

            // Check if mem cgroup is mounted, only then check for write-access to avoid
@@ -100,9 +96,6 @@ static const char* getCgroupRootPath() { 
                    ACCT_CGROUP_PATH : MEM_CGROUP_PATH;

                    ACCT_CGROUP_PATH : MEM_CGROUP_PATH;

            });

            });

    return cgroup_root_path;

    return cgroup_root_path;

#else

    return ACCT_CGROUP_PATH;

#endif

}

}





static int convertUidToPath(char *path, size_t size, uid_t uid)

static int convertUidToPath(char *path, size_t size, uid_t uid)

rootdir/init.rc

+2 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ on early-init 
    mount cgroup none /dev/memcg memory

    mount cgroup none /dev/memcg memory

    # app mem cgroups, used by activity manager, lmkd and zygote

    # app mem cgroups, used by activity manager, lmkd and zygote

    mkdir /dev/memcg/apps/ 0755 system system

    mkdir /dev/memcg/apps/ 0755 system system

    # cgroup for system_server and surfaceflinger

    mkdir /dev/memcg/system 0550 system system





    start ueventd

    start ueventd