commit dda59691e059101b00c70c49e7e2718d3b7c5d99
author David Sehr <sehr@google.com> Tue May 09 15:41:09 2017 -0700
committer David Sehr <sehr@google.com> Tue May 09 17:07:52 2017 -0700
tree ca8b28f2c5bd810b8f1fca4a167c51e1ebd16a9e
parent e5cb1102b4da7ae72951baf375a541e0c5cf481f

Fix page accounting for multidex

Dexdiag was using the offset into the mapping rather than into the dex
file for determining the types of pages.  This resulted in multidex
files having incorrect accounting.

Bug: 38181622
Test: make test-art-target-gtest-dexdiag_test
Change-Id: I00a4e21db5f57f75642a17e8edaa9c73b8b529b6

dexlayout/dexdiag.cc

diff --git a/dexlayout/dexdiag.cc b/dexlayout/dexdiag.cc
index ea2679a..b4101f8 100644
--- a/dexlayout/dexdiag.cc
+++ b/dexlayout/dexdiag.cc
@@ -197,7 +197,8 @@
   for (size_t page = start; page < end; ++page) {
     char type_char = '.';
     if (PM_PAGEMAP_PRESENT(pagemap[page])) {
-      uint16_t type = FindSectionTypeForPage(page, sections);
+      const size_t dex_page_offset = page - start;
+      uint16_t type = FindSectionTypeForPage(dex_page_offset, sections);
       page_counts->Increment(type);
       type_char = PageTypeChar(type);
     }
@@ -228,7 +229,8 @@
     return;
   }
   for (size_t page = start; page < end; ++page) {
-    mapped_pages.Increment(FindSectionTypeForPage(page, sections));
+    const size_t dex_page_offset = page - start;
+    mapped_pages.Increment(FindSectionTypeForPage(dex_page_offset, sections));
   }
   size_t total_resident_pages = 0;
   printer->PrintHeader();