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

Commit dae9f5a5 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android Git Automerger
Browse files

am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs." 

* commit 'f3a2430a':
  Add dalvik.vm.gctype to enable switching between different GCs.
parents 5c4c68da f3a2430a

core/jni/AndroidRuntime.cpp

+8 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char heapgrowthlimitOptsBuf[sizeof("-XX:HeapGrowthLimit=")-1 + PROPERTY_VALUE_MAX];

    char heapminfreeOptsBuf[sizeof("-XX:HeapMinFree=")-1 + PROPERTY_VALUE_MAX];

    char heapmaxfreeOptsBuf[sizeof("-XX:HeapMaxFree=")-1 + PROPERTY_VALUE_MAX];

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

    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];

    char jitcodecachesizeOptsBuf[sizeof("-Xjitcodecachesize:")-1 + PROPERTY_VALUE_MAX];

    char extraOptsBuf[PROPERTY_VALUE_MAX];
@@ -582,6 +583,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
      mOptions.add(opt);

    }



    strcpy(gctypeOptsBuf, "-Xgc:");

    property_get("dalvik.vm.gctype", gctypeOptsBuf+5, "");

    if (gctypeOptsBuf[5] != '\0') {

        opt.optionString = gctypeOptsBuf;

        mOptions.add(opt);

    }



    /*

     * Enable or disable dexopt features, such as bytecode verification and

     * calculation of register maps for precise GC.