am cb2906e4: am d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo

Merge commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca' into kraken

* commit 'cb2906e4bbb96b0be83029572a78f97dc6763eca':
  Add command line flags to enable lock profiling.
This commit is contained in:
Carl Shapiro
2010-04-16 13:31:39 -07:00
committed by Android Git Automerger

View File

@@ -702,6 +702,24 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
//mOptions.add(opt);
}
char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:") + sizeof(propBuf)];
property_get("dalvik.vm.lockprof.threshold", propBuf, "");
if (strlen(propBuf) > 0) {
strcpy(lockProfThresholdBuf, "-Xlockprofthreshold:");
strcat(lockProfThresholdBuf, propBuf);
opt.optionString = lockProfThresholdBuf;
mOptions.add(opt);
}
char lockProfSampleBuf[sizeof("-Xlockprofsample:") + sizeof(propBuf)];
property_get("dalvik.vm.lockprof.sample", propBuf, "");
if (strlen(propBuf) > 0) {
strcpy(lockProfSampleBuf, "-Xlockprofsample:");
strcat(lockProfSampleBuf, propBuf);
opt.optionString = lockProfSampleBuf;
mOptions.add(opt);
}
#if defined(WITH_JIT)
/* Minimal profile threshold to trigger JIT compilation */
char jitThresholdBuf[sizeof("-Xjitthreshold:") + PROPERTY_VALUE_MAX];