summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorbuzbee <buzbee@google.com>2013-06-13 19:57:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-13 19:57:25 +0000
commit34761a3abf127d6ef559bf68a32c5d62756d1054 (patch)
tree03b27cb9ead641831103018ef130618f718ca6cc /core/jni
parentb28f8c82d92b06e7eba3bcb5b5c2e9757597a7c9 (diff)
parentb63de6de026b8ebe0b7d7b7f188afc30fff42411 (diff)
downloadframeworks_base-34761a3abf127d6ef559bf68a32c5d62756d1054.zip
frameworks_base-34761a3abf127d6ef559bf68a32c5d62756d1054.tar.gz
frameworks_base-34761a3abf127d6ef559bf68a32c5d62756d1054.tar.bz2
Merge "Process new system property for max JIT cache size"
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/AndroidRuntime.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index bfa2e06..de32e44 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -460,6 +460,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
char heapminfreeOptsBuf[sizeof("-XX:HeapMinFree=")-1 + PROPERTY_VALUE_MAX];
char heapmaxfreeOptsBuf[sizeof("-XX:HeapMaxFree=")-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];
char* stackTraceFile = NULL;
bool checkJni = false;
@@ -551,6 +552,14 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
opt.optionString = "-XX:mainThreadStackSize=24K";
mOptions.add(opt);
+ // Set the max jit code cache size. Note: size of 0 will disable the JIT.
+ strcpy(jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");
+ property_get("dalvik.vm.jit.codecachesize", jitcodecachesizeOptsBuf+19, NULL);
+ if (jitcodecachesizeOptsBuf[19] != '\0') {
+ opt.optionString = jitcodecachesizeOptsBuf;
+ mOptions.add(opt);
+ }
+
strcpy(heapgrowthlimitOptsBuf, "-XX:HeapGrowthLimit=");
property_get("dalvik.vm.heapgrowthlimit", heapgrowthlimitOptsBuf+20, "");
if (heapgrowthlimitOptsBuf[20] != '\0') {