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

Merge "Remove gMallocLeakZygoteChild." into qt-dev

Browse Source
This commit is contained in:
Christopher Ferris
2019-04-17 17:30:22 +00:00
committed by Android (Google) Code Review
parent f447240a0c c00c1cfb54
commit dc6a988e5f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -73,6 +73,7 @@
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <bionic_malloc.h>
#include <cutils/ashmem.h> #include <cutils/ashmem.h>
#include <cutils/fs.h> #include <cutils/fs.h>
#include <cutils/multiuser.h> #include <cutils/multiuser.h>
@@ -499,12 +500,9 @@ static void EnableDebugger() {
} }
} }
// The debug malloc library needs to know whether it's the zygote or a child.
extern "C" int gMallocLeakZygoteChild;
static void PreApplicationInit() { static void PreApplicationInit() {
// The child process sets this to indicate it's not the zygote. // The child process sets this to indicate it's not the zygote.
gMallocLeakZygoteChild = 1; android_mallopt(M_SET_ZYGOTE_CHILD, nullptr, 0);
// Set the jemalloc decay time to 1. // Set the jemalloc decay time to 1.
mallopt(M_DECAY_TIME, 1); mallopt(M_DECAY_TIME, 1);