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

Commit bd71bf18 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 8922ddba: am a6e06889: Merge "Add profiler type options" 

* commit '8922ddba':
  Add profiler type options
parents 86b55c52 8922ddba

core/jni/AndroidRuntime.cpp

+16 −0
Original line number Diff line number Diff line
@@ -490,6 +490,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char profile_backoff[sizeof("-Xprofile-backoff:") + PROPERTY_VALUE_MAX];

    char profile_top_k_threshold[sizeof("-Xprofile-top-k-threshold:") + PROPERTY_VALUE_MAX];

    char profile_top_k_change_threshold[sizeof("-Xprofile-top-k-change-threshold:") + PROPERTY_VALUE_MAX];

    char profile_type[sizeof("-Xprofile-type:") + PROPERTY_VALUE_MAX];

    char profile_max_stack_depth[sizeof("-Xprofile-max-stack-depth:")+PROPERTY_VALUE_MAX];

    char langOption[sizeof("-Duser.language=") + 3];

    char regionOption[sizeof("-Duser.region=") + 3];

    char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:") + sizeof(propBuf)];
@@ -872,6 +874,20 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
            opt.optionString = profile_top_k_change_threshold;

            mOptions.add(opt);

        }



        // Type of profile data.

        strcpy(profile_type, "-Xprofile-type:");

        if (property_get("dalvik.vm.profiler.type", profile_type+15, NULL) > 0) {

            opt.optionString = profile_type;

            mOptions.add(opt);

        }



        // Depth of bounded stack data

        strcpy(profile_max_stack_depth, "-Xprofile-max-stack-depth:");

        if (property_get("dalvik.vm.profile.max-stack-depth", profile_max_stack_depth+26, NULL) > 0) {

           opt.optionString = profile_max_stack_depth;

           mOptions.add(opt);

        }

    }



    initArgs.version = JNI_VERSION_1_4;