diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-27 14:35:38 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-10 12:57:27 -0700 |
| commit | c785344b87221f5e4e6473e5b762e4e61fe65dcf (patch) | |
| tree | cd32ad2c2604596a18926f04d4c313dab255ecfd /patchoat/patchoat.h | |
| parent | a29d93b380c9aeb8270e281aefbdd0c77a430d43 (diff) | |
| download | art-c785344b87221f5e4e6473e5b762e4e61fe65dcf.zip art-c785344b87221f5e4e6473e5b762e4e61fe65dcf.tar.gz art-c785344b87221f5e4e6473e5b762e4e61fe65dcf.tar.bz2 | |
Move ArtField to native
Add linear alloc. Moved ArtField to be native object. Changed image
writer to put ArtFields after the mirror section.
Savings:
2MB on low ram devices
4MB on normal devices
Total PSS measurements before (normal N5, 95s after shell start):
Image size: 7729152 bytes
23112 kB: .NonMoving
23212 kB: .NonMoving
22868 kB: .NonMoving
23072 kB: .NonMoving
22836 kB: .NonMoving
19618 kB: .Zygote
19850 kB: .Zygote
19623 kB: .Zygote
19924 kB: .Zygote
19612 kB: .Zygote
Avg: 42745.4 kB
After:
Image size: 7462912 bytes
17440 kB: .NonMoving
16776 kB: .NonMoving
16804 kB: .NonMoving
17812 kB: .NonMoving
16820 kB: .NonMoving
18788 kB: .Zygote
18856 kB: .Zygote
19064 kB: .Zygote
18841 kB: .Zygote
18629 kB: .Zygote
3499 kB: .LinearAlloc
3408 kB: .LinearAlloc
3424 kB: .LinearAlloc
3600 kB: .LinearAlloc
3436 kB: .LinearAlloc
Avg: 39439.4 kB
No reflection performance changes.
Bug: 19264997
Bug: 17643507
Change-Id: I10c73a37913332080aeb978c7c94713bdfe4fe1c
Diffstat (limited to 'patchoat/patchoat.h')
| -rw-r--r-- | patchoat/patchoat.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/patchoat/patchoat.h b/patchoat/patchoat.h index 578df3a..418650a 100644 --- a/patchoat/patchoat.h +++ b/patchoat/patchoat.h @@ -117,12 +117,31 @@ class PatchOat { bool PatchOatHeader(ElfFileImpl* oat_file); bool PatchImage() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void PatchArtFields(const ImageHeader* image_header) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void PatchDexFileArrays(mirror::ObjectArray<mirror::Object>* img_roots) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); bool WriteElf(File* out); bool WriteImage(File* out); - mirror::Object* RelocatedCopyOf(mirror::Object*); - mirror::Object* RelocatedAddressOf(mirror::Object* obj); + template <typename T> + T* RelocatedCopyOf(T* obj) { + if (obj == nullptr) { + return nullptr; + } + DCHECK_GT(reinterpret_cast<uintptr_t>(obj), reinterpret_cast<uintptr_t>(heap_->Begin())); + DCHECK_LT(reinterpret_cast<uintptr_t>(obj), reinterpret_cast<uintptr_t>(heap_->End())); + uintptr_t heap_off = + reinterpret_cast<uintptr_t>(obj) - reinterpret_cast<uintptr_t>(heap_->Begin()); + DCHECK_LT(heap_off, image_->Size()); + return reinterpret_cast<T*>(image_->Begin() + heap_off); + } + + template <typename T> + T* RelocatedAddressOfPointer(T* obj) { + return obj == nullptr ? nullptr : + reinterpret_cast<T*>(reinterpret_cast<uintptr_t>(obj) + delta_); + } // Look up the oat header from any elf file. static const OatHeader* GetOatHeader(const ElfFile* elf_file); |