diff options
| -rw-r--r-- | runtime/class_linker.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index e4f492b221..205ba3eac7 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1669,6 +1669,22 @@ bool ClassLinker::AddImageSpace( forward_dex_cache_arrays); class_table->Visit(visitor); } + // forward_dex_cache_arrays is true iff we copied all of the dex cache arrays into the .bss. + // In this case, madvise away the dex cache arrays section of the image to reduce RAM usage and + // mark as PROT_NONE to catch any invalid accesses. + if (forward_dex_cache_arrays) { + const ImageSection& dex_cache_section = header.GetImageSection( + ImageHeader::kSectionDexCacheArrays); + uint8_t* section_begin = AlignUp(space->Begin() + dex_cache_section.Offset(), kPageSize); + uint8_t* section_end = AlignDown(space->Begin() + dex_cache_section.End(), kPageSize); + if (section_begin < section_end) { + madvise(section_begin, section_end - section_begin, MADV_DONTNEED); + mprotect(section_begin, section_end - section_begin, PROT_NONE); + VLOG(image) << "Released and protected dex cache array image section from " + << reinterpret_cast<const void*>(section_begin) << "-" + << reinterpret_cast<const void*>(section_end); + } + } } VLOG(class_linker) << "Adding image space took " << PrettyDuration(NanoTime() - start_time); return true; |