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

am b098f735: Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb

Browse Source 
* commit 'b098f73556ae31f505782d2fe7028b83d1564147':
  Add a property for specifying a dalvik heap growth limit.
This commit is contained in:
Carl Shapiro
2011-01-19 14:42:07 -08:00
committed by Android Git Automerger
parent 1aae1c2a9b b098f73556
commit 82ce9e02ec
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/phone-hdpi-512-dalvik-heap.mk
View File

@@ -19,5 +19,4 @@
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.heapstartsize=5m \ dalvik.vm.heapstartsize=5m \
dalvik.vm.smallheapsize=32m \
dalvik.vm.heapsize=32m dalvik.vm.heapsize=32m

1
build/phone-hdpi-dalvik-heap.mk
View File

@@ -18,5 +18,4 @@
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.heapstartsize=5m \ dalvik.vm.heapstartsize=5m \
dalvik.vm.smallheapsize=32m \
dalvik.vm.heapsize=32m dalvik.vm.heapsize=32m

4
build/tablet-dalvik-heap.mk
View File

@@ -18,5 +18,5 @@
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.heapstartsize=5m \ dalvik.vm.heapstartsize=5m \
dalvik.vm.smallheapsize=48m \ dalvik.vm.growthlimit=48m \
dalvik.vm.heapsize=48m dalvik.vm.heapsize=256m

8
core/jni/AndroidRuntime.cpp
View File

@@ -568,6 +568,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
char jniOptsBuf[sizeof("-Xjniopts:")-1 + PROPERTY_VALUE_MAX]; char jniOptsBuf[sizeof("-Xjniopts:")-1 + PROPERTY_VALUE_MAX];
char heapstartsizeOptsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX]; char heapstartsizeOptsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
char heapsizeOptsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX]; char heapsizeOptsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];
char heapgrowthlimitOptsBuf[sizeof("-XX:HeapGrowthLimit=")-1 + PROPERTY_VALUE_MAX];
char extraOptsBuf[PROPERTY_VALUE_MAX]; char extraOptsBuf[PROPERTY_VALUE_MAX];
char* stackTraceFile = NULL; char* stackTraceFile = NULL;
bool checkJni = false; bool checkJni = false;
@@ -659,6 +660,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
opt.optionString = heapsizeOptsBuf; opt.optionString = heapsizeOptsBuf;
mOptions.add(opt); mOptions.add(opt);
strcpy(heapgrowthlimitOptsBuf, "-XX:HeapGrowthLimit=");
property_get("dalvik.vm.heapgrowthlimit", heapgrowthlimitOptsBuf+20, "");
if (heapgrowthlimitOptsBuf[20] != '\0') {
opt.optionString = heapgrowthlimitOptsBuf;
mOptions.add(opt);
}
/* /*
* Enable or disable dexopt features, such as bytecode verification and * Enable or disable dexopt features, such as bytecode verification and
* calculation of register maps for precise GC. * calculation of register maps for precise GC.