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

Commit 876927e7 authored by Jagadeesh Pakaravoor's avatar Jagadeesh Pakaravoor Committed by Automerger Merge Worker
Browse files

Merge "Add madvising of .odex, .vdex and .art files" am: fcf61e80 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ca142cfa6bed60d8a0fec2156c689222cdfeb1a
parents d57ee076 fcf61e80

core/jni/AndroidRuntime.cpp

+22 −0
Original line number Diff line number Diff line
@@ -630,6 +630,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    char saveResolvedClassesDelayMsOptsBuf[

            sizeof("-Xps-save-resolved-classes-delay-ms:")-1 + PROPERTY_VALUE_MAX];

    char madviseRandomOptsBuf[sizeof("-XX:MadviseRandomAccess:")-1 + PROPERTY_VALUE_MAX];

    char madviseWillNeedFileSizeVdex[

            sizeof("-XMadviseWillNeedVdexFileSize:")-1 + PROPERTY_VALUE_MAX];

    char madviseWillNeedFileSizeOdex[

            sizeof("-XMadviseWillNeedOdexFileSize:")-1 + PROPERTY_VALUE_MAX];

    char madviseWillNeedFileSizeArt[

            sizeof("-XMadviseWillNeedArtFileSize:")-1 + PROPERTY_VALUE_MAX];

    char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];

    char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];

    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];
@@ -837,6 +843,22 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
     */

    parseRuntimeOption("dalvik.vm.madvise-random", madviseRandomOptsBuf, "-XX:MadviseRandomAccess:");



    /*

     * Use default platform configuration as limits for madvising,

     * when no properties are specified.

     */

    parseRuntimeOption("dalvik.vm.madvise.vdexfile.size",

                       madviseWillNeedFileSizeVdex,

                       "-XMadviseWillNeedVdexFileSize:");



    parseRuntimeOption("dalvik.vm.madvise.odexfile.size",

                       madviseWillNeedFileSizeOdex,

                       "-XMadviseWillNeedOdexFileSize:");



    parseRuntimeOption("dalvik.vm.madvise.artfile.size",

                       madviseWillNeedFileSizeArt,

                       "-XMadviseWillNeedArtFileSize:");



    /*

     * Profile related options.

     */