openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adbd: increase oom_score_adj for `adb shell`" 

am: db9671090d

Change-Id: I728eb8d2ab2e2fe1e06e5aa5681ef57c655184b1
This commit is contained in:
Josh Gao 2018-03-29 20:34:54 +00:00 committed by android-build-merger
parent b0d408f2f3 db9671090d
commit 1919289d12
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adb/daemon/shell_service.cpp
View File

@ -334,6 +334,15 @@ bool Subprocess::ForkAndExec(std::string* error) {
// processes, so we need to manually reset back to SIG_DFL here (http://b/35209888).
signal(SIGPIPE, SIG_DFL);
// Increase oom_score_adj from -1000, so that the child is visible to the OOM-killer.
// Don't treat failure as an error, because old Android kernels explicitly disabled this.
int oom_score_adj_fd = adb_open("/proc/self/oom_score_adj", O_WRONLY | O_CLOEXEC);
if (oom_score_adj_fd != -1) {
const char* oom_score_adj_value = "-950";
TEMP_FAILURE_RETRY(
adb_write(oom_score_adj_fd, oom_score_adj_value, strlen(oom_score_adj_value)));
}
if (command_.empty()) {
execle(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr, cenv.data());
} else {