commit 0420f81a5c6c08bc62060b8ff5dda8949f9a9ce9
author David Srbecky <dsrbecky@google.com> Wed Jun 17 21:59:58 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 17 21:59:59 2015 +0000
tree 2a258a5c9c0f2a5cb719d04eed161a0b432a91bf
parent b66fda7c7e2e3c24e2a146c3f9d904b1828346a1
parent 82e73dcc290ae8603c8a2e533d6a8a19cc2983a3

Merge "Release dummy MemMaps corresponding to dlopen."

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 225fee0..ad5741e 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -301,15 +301,17 @@
             uint8_t* vaddr = reinterpret_cast<uint8_t*>(info->dlpi_addr +
                                                         info->dlpi_phdr[i].p_vaddr);
             size_t memsz = info->dlpi_phdr[i].p_memsz;
-            MemMap::MapDummy(info->dlpi_name, vaddr, memsz);
+            MemMap* mmap = MemMap::MapDummy(info->dlpi_name, vaddr, memsz);
+            context->dlopen_mmaps_->push_back(std::unique_ptr<MemMap>(mmap));
           }
         }
         return 1;  // Stop iteration and return 1 from dl_iterate_phdr.
       }
       return 0;  // Continue iteration and return 0 from dl_iterate_phdr when finished.
     }
-    const uint8_t* begin_;
-  } context = { begin_ };
+    const uint8_t* const begin_;
+    std::vector<std::unique_ptr<MemMap>>* const dlopen_mmaps_;
+  } context = { begin_, &dlopen_mmaps_ };
 
   if (dl_iterate_phdr(dl_iterate_context::callback, &context) == 0) {
     PrintFileToLog("/proc/self/maps", LogSeverity::WARNING);

runtime/oat_file.h

diff --git a/runtime/oat_file.h b/runtime/oat_file.h
index c58b029..1a782de 100644
--- a/runtime/oat_file.h
+++ b/runtime/oat_file.h
@@ -321,6 +321,9 @@
   // dlopen handle during runtime.
   void* dlopen_handle_;
 
+  // Dummy memory map objects corresponding to the regions mapped by dlopen.
+  std::vector<std::unique_ptr<MemMap>> dlopen_mmaps_;
+
   // Owning storage for the OatDexFile objects.
   std::vector<const OatDexFile*> oat_dex_files_storage_;