Merge "lmkd: Disable memory.stat usage when per-application memcgs are not used"
This commit is contained in:
commit
615745cead
1 changed files with 4 additions and 1 deletions
|
@ -111,6 +111,7 @@ static bool low_ram_device;
|
|||
static bool kill_heaviest_task;
|
||||
static unsigned long kill_timeout_ms;
|
||||
static bool use_minfree_levels;
|
||||
static bool per_app_memcg;
|
||||
|
||||
/* data required to handle events */
|
||||
struct event_handler_info {
|
||||
|
@ -472,7 +473,7 @@ static void cmd_procprio(LMKD_CTRL_PACKET packet) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (low_ram_device) {
|
||||
if (per_app_memcg) {
|
||||
if (params.oomadj >= 900) {
|
||||
soft_limit_mult = 0;
|
||||
} else if (params.oomadj >= 800) {
|
||||
|
@ -1481,6 +1482,8 @@ int main(int argc __unused, char **argv __unused) {
|
|||
(unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);
|
||||
use_minfree_levels =
|
||||
property_get_bool("ro.lmk.use_minfree_levels", false);
|
||||
per_app_memcg =
|
||||
property_get_bool("ro.config.per_app_memcg", low_ram_device);
|
||||
|
||||
if (!init()) {
|
||||
if (!use_inkernel_interface) {
|
||||
|
|
Loading…
Reference in a new issue