commit e58991b3b2282b5761f1a6023a16c803e1c4eb45
author Mathieu Chartier <mathieuc@google.com> Tue Oct 13 07:59:34 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Oct 13 13:17:50 2015 -0700
tree 5a6fac6c5d3cb6a463463b83b8a34a53b07a8ede
parent fb11bab9bc96ff05dcb12f43abf58df256b7c7aa

Revert "Revert "Unload oat files""

Fixed a race where two threads calling OatFile::Open could both use
dlopen on the host.

Bug: 22720414

This reverts commit 72da5e7461fec3b1e116050f2e6f233efb9c54f3.

Change-Id: I1636045b724944d2a09417527280784967957095

runtime/mem_map.h

diff --git a/runtime/mem_map.h b/runtime/mem_map.h
index 196a7f6..7c11ceb 100644
--- a/runtime/mem_map.h
+++ b/runtime/mem_map.h
@@ -161,6 +161,8 @@
       REQUIRES(Locks::mem_maps_lock_);
   static MemMap* GetLargestMemMapAt(void* address)
       REQUIRES(Locks::mem_maps_lock_);
+  static bool ContainedWithinExistingMap(uint8_t* ptr, size_t size, std::string* error_msg)
+      REQUIRES(!Locks::mem_maps_lock_);
 
   const std::string name_;
   uint8_t* const begin_;  // Start of data.