diff options
| author | 2020-02-05 17:17:02 -0800 | |
|---|---|---|
| committer | 2020-02-06 13:33:50 -0800 | |
| commit | b4607fc27e528db5532335ecbefe59ae946cbf40 (patch) | |
| tree | 12ed4c6800a895485db56a0b7eba4408862c44aa | |
| parent | 53ae130d31a485682d8babdf0dbf9ab261732d66 (diff) | |
Make FinalizerTimeoutMs and ThreadSuspendTimeout system prop
Currently these are command line options for dalvikvm. Exposing them to
system property.
Bug:143848108
Test: flash device; adb shell setprop dalvik.vm.finalizer-timeout-ms
<val>; adb shell stop; adb shell start; adb shell getprop dalvik.vm.finalizer-timeout-ms
Change-Id: I3bd16ea0c4a01b7e400b3e6e67eb47cf7a26afce
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 9a27e719e5d9..0aa0c5afc315 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -672,6 +672,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX]; char foregroundHeapGrowthMultiplierOptsBuf[ sizeof("-XX:ForegroundHeapGrowthMultiplier=")-1 + PROPERTY_VALUE_MAX]; + char finalizerTimeoutMsOptsBuf[sizeof("-XX:FinalizerTimeoutMs=")-1 + PROPERTY_VALUE_MAX]; + char threadSuspendTimeoutOptsBuf[sizeof("-XX:ThreadSuspendTimeout=")-1 + PROPERTY_VALUE_MAX]; char cachePruneBuf[sizeof("-Xzygote-max-boot-retry=")-1 + PROPERTY_VALUE_MAX]; char dex2oatXmsImageFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX]; char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX]; @@ -825,7 +827,15 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p parseRuntimeOption("dalvik.vm.foreground-heap-growth-multiplier", foregroundHeapGrowthMultiplierOptsBuf, "-XX:ForegroundHeapGrowthMultiplier="); - + /* + * Finalizer and thread suspend timeouts. + */ + parseRuntimeOption("dalvik.vm.finalizer-timeout-ms", + finalizerTimeoutMsOptsBuf, + "-XX:FinalizerTimeoutMs="); + parseRuntimeOption("dalvik.vm.thread-suspend-timeout-ms", + threadSuspendTimeoutOptsBuf, + "-XX:ThreadSuspendTimeout="); /* * JIT related options. */ |