Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options
This commit is contained in:
Brian Carlstrom
2014-07-01 22:37:18 +00:00
committed by Android Git Automerger
parent 86b55c52c7 8922ddbab1
commit bd71bf1814
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/jni/AndroidRuntime.cpp
View File

@@ -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;