diff options
| author | Wessam Hassanein <wessam@google.com> | 2021-05-07 03:11:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 03:11:25 +0000 |
| commit | a431288fbed7618cf69991578b51453afd168e7b (patch) | |
| tree | d9c611def0990c0a90985818ebf002a7faf5130a /core/jni/AndroidRuntime.cpp | |
| parent | 0ea41c463682abb16e3cee8ba17b4a3090a3dbf8 (diff) | |
| parent | 12dfac624742124768204e93c41f37106479d06d (diff) | |
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
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 |
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"); } |