From f1d719b0a27d739964d999c81158bf45e5e71cd7 Mon Sep 17 00:00:00 2001 From: Wessam Hassanein Date: Fri, 30 Apr 2021 01:33:21 -0700 Subject: Enable PerfettoJavaHeapStackProf in the zygote. This allows us to collect Java Heap Profiler data directly without needing to set the flag similar to PerfettoHprof. Test: Passing Tests Local Testing Bug: 160214819 Change-Id: Id4888107c7b12f076de8237fd42bab49319566b5 --- core/jni/AndroidRuntime.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core/jni/AndroidRuntime.cpp') diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 855448b21069..11f76a4ebc2e 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -662,6 +662,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, @@ -776,6 +778,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"); } -- cgit v1.2.3