Merge "Enable PerfettoJavaHeapStackProf in the zygote." am: 45087d31f8 am: 12dfac6247

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692305

Change-Id: Idee0c7b34ec3ab8e8ce74c5802420603418da32e
This commit is contained in:
Wessam Hassanein
2021-05-07 03:11:25 +00:00
committed by Automerger Merge Worker

View File

@@ -663,6 +663,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
char extraOptsBuf[PROPERTY_VALUE_MAX];
char voldDecryptBuf[PROPERTY_VALUE_MAX];
char perfettoHprofOptBuf[sizeof("-XX:PerfettoHprof=") + PROPERTY_VALUE_MAX];
char perfettoJavaHeapStackOptBuf[
sizeof("-XX:PerfettoJavaHeapStackProf=") + PROPERTY_VALUE_MAX];
enum {
kEMDefault,
kEMIntPortable,
@@ -777,6 +779,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
parseRuntimeOption("dalvik.vm.perfetto_hprof", perfettoHprofOptBuf, "-XX:PerfettoHprof=",
"true");
// Enable PerfettoJavaHeapStackProf in the zygote
parseRuntimeOption("dalvik.vm.perfetto_javaheap", perfettoJavaHeapStackOptBuf,
"-XX:PerfettoJavaHeapStackProf=", "true");
if (primary_zygote) {
addOption("-Xprimaryzygote");
}