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

am d3255076: Merge "Installd: Swap file for dex2oat"

Browse Source 
* commit 'd325507698d8379e431a8c8fefcfafe59956bd88':
  Installd: Swap file for dex2oat
This commit is contained in:
Andreas Gampe 2014-12-22 18:39:37 +00:00 committed by Android Git Automerger
commit 4fb9f9377e
1 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cmds/installd/commands.c
View File

@ -697,7 +697,7 @@ static void run_patchoat(int input_fd, int oat_fd, const char* input_file_name,
}
static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
const char* output_file_name, const char *pkgname, const char *instruction_set,
const char* output_file_name, int swap_fd, const char *pkgname, const char *instruction_set,
bool vm_safe_mode)
{
static const unsigned int MAX_INSTRUCTION_SET_LEN = 7;
@ -763,6 +763,8 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
char dex2oat_Xms_arg[strlen("-Xms") + PROPERTY_VALUE_MAX];
char dex2oat_Xmx_arg[strlen("-Xmx") + PROPERTY_VALUE_MAX];
char dex2oat_compiler_filter_arg[strlen("--compiler-filter=") + PROPERTY_VALUE_MAX];
bool have_dex2oat_swap_fd = false;
char dex2oat_swap_fd[strlen("--swap-fd=") + MAX_INT_LEN];
sprintf(zip_fd_arg, "--zip-fd=%d", zip_fd);
sprintf(zip_location_arg, "--zip-location=%s", input_file_name);
@ -771,6 +773,10 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
sprintf(instruction_set_arg, "--instruction-set=%s", instruction_set);
sprintf(instruction_set_variant_arg, "--instruction-set-variant=%s", dex2oat_isa_variant);
sprintf(instruction_set_features_arg, "--instruction-set-features=%s", dex2oat_isa_features);
if (swap_fd >= 0) {
have_dex2oat_swap_fd = true;
sprintf(dex2oat_swap_fd, "--swap-fd=%d", swap_fd);
}
bool have_profile_file = false;
bool have_top_k_profile_threshold = false;
@ -816,6 +822,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
+ (have_dex2oat_Xms_flag ? 2 : 0)
+ (have_dex2oat_Xmx_flag ? 2 : 0)
+ (have_dex2oat_compiler_filter_flag ? 1 : 0)
+ (have_dex2oat_swap_fd ? 1 : 0)
+ dex2oat_flags_count];
int i = 0;
argv[i++] = (char*)DEX2OAT_BIN;
@ -847,6 +854,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
if (have_dex2oat_compiler_filter_flag) {
argv[i++] = dex2oat_compiler_filter_arg;
}
if (have_dex2oat_swap_fd) {
argv[i++] = dex2oat_swap_fd;
}
if (dex2oat_flags_count) {
i += split(dex2oat_flags, argv + i);
}
@ -883,6 +893,23 @@ static int wait_child(pid_t pid)
}
}
/*
* Whether dexopt should use a swap file when compiling an APK. If kAlwaysProvideSwapFile, do this
* on all devices (dex2oat will make a more informed decision itself, anyways). Otherwise, only do
* this on a low-mem device.
*/
static bool kAlwaysProvideSwapFile = true;
static bool ShouldUseSwapFileForDexopt() {
if (kAlwaysProvideSwapFile) {
return true;
}
char low_mem_buf[PROPERTY_VALUE_MAX];
property_get("ro.config.low_ram", low_mem_buf, "");
return (strcmp(low_mem_buf, "true") == 0);
}
int dexopt(const char *apk_path, uid_t uid, bool is_public,
const char *pkgname, const char *instruction_set,
bool vm_safe_mode, bool is_patchoat)
@ -890,11 +917,15 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public,
struct utimbuf ut;
struct stat input_stat, dex_stat;
char out_path[PKG_PATH_MAX];
char swap_file_name[PKG_PATH_MAX];
char *end;
const char *input_file;
char in_odex_path[PKG_PATH_MAX];
int res, input_fd=-1, out_fd=-1;
int res, input_fd=-1, out_fd=-1, swap_fd=-1;
// Early best-effort check whether we can fit the the path into our buffers.
// Note: the cache path will require an additional 5 bytes for ".swap", but we'll try to run
// without a swap file, if necessary.
if (strlen(apk_path) >= (PKG_PATH_MAX - 8)) {
return -1;
}
@ -969,6 +1000,28 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public,
create_profile_file(pkgname, uid);
}
// Create a swap file if necessary.
if (!is_patchoat && ShouldUseSwapFileForDexopt()) {
// Make sure there really is enough space.
size_t out_len = strlen(out_path);
if (out_len + strlen(".swap") + 1 <= PKG_PATH_MAX) {
strcpy(swap_file_name, out_path);
strcpy(swap_file_name + strlen(out_path), ".swap");
unlink(swap_file_name);
swap_fd = open(swap_file_name, O_RDWR | O_CREAT | O_EXCL, 0600);
if (swap_fd < 0) {
// Could not create swap file. Optimistically go on and hope that we can compile
// without it.
ALOGE("installd could not create '%s' for swap during dexopt\n", swap_file_name);
} else {
// Immediately unlink. We don't really want to hit flash.
unlink(swap_file_name);
}
} else {
// Swap file path is too long. Try to run without.
ALOGE("installd could not create swap file for path %s during dexopt\n", out_path);
}
}
ALOGV("DexInv: --- BEGIN '%s' ---\n", input_file);
@ -1010,7 +1063,7 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public,
if (is_patchoat) {
run_patchoat(input_fd, out_fd, input_file, out_path, pkgname, instruction_set);
} else {
run_dex2oat(input_fd, out_fd, input_file, out_path, pkgname, instruction_set,
run_dex2oat(input_fd, out_fd, input_file, out_path, swap_fd, pkgname, instruction_set,
vm_safe_mode);
}
exit(68); /* only get here on exec failure */
@ -1030,6 +1083,9 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public,
close(out_fd);
close(input_fd);
if (swap_fd != -1) {
close(swap_fd);
}
return 0;
fail: