summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWessam Hassanein <wessam@google.com>2021-05-06 21:08:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-05-06 21:08:01 +0000
commit45087d31f8b9af1880ff712bd24d2edbc5a1f33b (patch)
tree23347b9ab5c7ae401ed88242c7ce2155576e99c9
parenta863b0297b632bc52c8e45d62e6dd6daa2eefa5a (diff)
parentf1d719b0a27d739964d999c81158bf45e5e71cd7 (diff)
Merge "Enable PerfettoJavaHeapStackProf in the zygote."
-rw-r--r--core/jni/AndroidRuntime.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 9a555c123aad..114f3955fc86 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -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");
}