ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Installd: Add a swap override flag

Browse Source 
Add dalvik.vm.dex2oat-swap system property to override a default
decision.

Bug: 20658562
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
This commit is contained in:
Andreas Gampe 2015-07-16 15:55:41 -07:00
parent fd54957888
commit c968c0175e
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cmds/installd/commands.cpp
View File

@ -984,20 +984,49 @@ static int wait_child(pid_t pid)
} }
/* /*
* Whether dexopt should use a swap file when compiling an APK. If kAlwaysProvideSwapFile, do this * Whether dexopt should use a swap file when compiling an APK.
* on all devices (dex2oat will make a more informed decision itself, anyways). Otherwise, only do *
* this on a low-mem device. * If kAlwaysProvideSwapFile, do this on all devices (dex2oat will make a more informed decision
* itself, anyways).
*
* Otherwise, read "dalvik.vm.dex2oat-swap". If the property exists, return whether it is "true".
*
* Otherwise, return true if this is a low-mem device.
*
* Otherwise, return default value.
*/ */
static bool kAlwaysProvideSwapFile = true; static bool kAlwaysProvideSwapFile = false;
static bool kDefaultProvideSwapFile = true;
static bool ShouldUseSwapFileForDexopt() { static bool ShouldUseSwapFileForDexopt() {
if (kAlwaysProvideSwapFile) { if (kAlwaysProvideSwapFile) {
return true; return true;
} }
char low_mem_buf[PROPERTY_VALUE_MAX]; // Check the "override" property. If it exists, return value == "true".
property_get("ro.config.low_ram", low_mem_buf, ""); char dex2oat_prop_buf[PROPERTY_VALUE_MAX];
return (strcmp(low_mem_buf, "true") == 0); if (property_get("dalvik.vm.dex2oat-swap", dex2oat_prop_buf, "") > 0) {
if (strcmp(dex2oat_prop_buf, "true") == 0) {
return true;
} else {
return false;
}
}
// Shortcut for default value. This is an implementation optimization for the process sketched
// above. If the default value is true, we can avoid to check whether this is a low-mem device,
// as low-mem is never returning false. The compiler will optimize this away if it can.
if (kDefaultProvideSwapFile) {
return true;
}
bool is_low_mem = check_boolean_property("ro.config.low_ram");
if (is_low_mem) {
return true;
}
// Default value must be false here.
return kDefaultProvideSwapFile;
} }
/* /*