Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add system_server to system group only if per_app_memcg is true"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-28 03:46:04 +00:00
committed by Gerrit Code Review
parent ac0ddfd9c5 696873ea17
commit afa1c743be
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -46,6 +46,7 @@
#include <unistd.h> #include <unistd.h>
#include "android-base/logging.h" #include "android-base/logging.h"
#include <android-base/properties.h>
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <cutils/fs.h> #include <cutils/fs.h>
@@ -71,6 +72,7 @@ namespace {
using android::String8; using android::String8;
using android::base::StringPrintf; using android::base::StringPrintf;
using android::base::WriteStringToFile; using android::base::WriteStringToFile;
using android::base::GetBoolProperty;
#define CREATE_ERROR(...) StringPrintf("%s:%d: ", __FILE__, __LINE__). \ #define CREATE_ERROR(...) StringPrintf("%s:%d: ", __FILE__, __LINE__). \
append(StringPrintf(__VA_ARGS__)) append(StringPrintf(__VA_ARGS__))
@@ -937,12 +939,16 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer(
RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!"); RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!");
} }
// Assign system_server to the correct memory cgroup. bool low_ram_device = GetBoolProperty("ro.config.low_ram", false);
// Not all devices mount /dev/memcg so check for the file first bool per_app_memcg = GetBoolProperty("ro.config.per_app_memcg", low_ram_device);
// to avoid unnecessarily printing errors and denials in the logs. if (per_app_memcg) {
if (!access("/dev/memcg/system/tasks", F_OK) && // Assign system_server to the correct memory cgroup.
// Not all devices mount /dev/memcg so check for the file first
// to avoid unnecessarily printing errors and denials in the logs.
if (!access("/dev/memcg/system/tasks", F_OK) &&
!WriteStringToFile(StringPrintf("%d", pid), "/dev/memcg/system/tasks")) { !WriteStringToFile(StringPrintf("%d", pid), "/dev/memcg/system/tasks")) {
ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid); ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid);
}
} }
} }
return pid; return pid;