From f7fd970244f143b1abb956e29794c446e4d57f46 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 9 Nov 2015 11:16:49 -0800 Subject: Load app images Support in-place patching of the app image based on boot image location and app oat location. Only loads for art run test so far since we do not automatically generate app images for app installs. N5 maps launch time (~200 runs): Before: 930ms After: 878.18ms After + image class table: 864.57ms TODO: Oatdump support. Store class loaders as class roots in image. Bug: 22858531 Change-Id: I9cbc645645e62ea2ed1ad8e139e91af7d88514c1 --- compiler/image_test.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'compiler/image_test.cc') diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 12132c0cd0..b8416751c5 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -155,7 +155,11 @@ void ImageTest::TestWriteRead(ImageHeader::StorageMode storage_mode) { { std::vector dup_oat_filename(1, dup_oat->GetPath().c_str()); std::vector dup_image_filename(1, image_file.GetFilename().c_str()); - bool success_image = writer->Write(kInvalidImageFd, dup_image_filename, dup_oat_filename); + bool success_image = writer->Write(kInvalidFd, + dup_image_filename, + kInvalidFd, + dup_oat_filename, + dup_oat_filename[0]); ASSERT_TRUE(success_image); bool success_fixup = ElfWriter::Fixup(dup_oat.get(), writer->GetOatDataBegin(dup_oat_filename[0])); @@ -292,11 +296,17 @@ TEST_F(ImageTest, ImageHeaderIsValid) { oat_data_begin, oat_data_end, oat_file_end, + /*boot_image_begin*/0U, + /*boot_image_size*/0U, + /*boot_oat_begin*/0U, + /*boot_oat_size_*/0U, sizeof(void*), /*compile_pic*/false, + /*is_pic*/false, ImageHeader::kDefaultStorageMode, /*data_size*/0u); ASSERT_TRUE(image_header.IsValid()); + ASSERT_TRUE(!image_header.IsAppImage()); char* magic = const_cast(image_header.GetMagic()); strcpy(magic, ""); // bad magic -- cgit v1.2.3-59-g8ed1b