Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d1ddcc authored by Wessam Hassanein's avatar Wessam Hassanein Committed by Automerger Merge Worker
Browse files

Merge "Enable PerfettoJavaHeapStackProf in the zygote." am: 45087d31 am:... 

Merge "Enable PerfettoJavaHeapStackProf in the zygote." am: 45087d31 am: 12dfac62 am: a431288f am: 0e86b445

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

Change-Id: I3b19d4b603f45f7bd4b0d1c04b7ca6503e105941
parents 82132daf 0e86b445

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Diff line number Diff line
@@ -671,6 +671,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,
@@ -785,6 +787,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");

    }