commit aea71ae52a6f846b39f89a3c395663f40b2f4184
author Hans Boehm <hboehm@google.com> Tue Jan 28 17:33:19 2020 -0800
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 29 11:51:31 2020 +0000
tree 842d8560cf736d45db7d6fcc0238ec38af535df7
parent a8fe58f0512a2147580b798e1cb8308420f8ae99

Add temporary logging to MemMap::swap

The intent is to track down the failures in

Bug: 148171362
Test: Check for logged strings in x86-32 build products.
Change-Id: If49a298cd75c11aae694ff0ab2db3945ada71eb5

libartbase/base/mem_map.cc

diff --git a/libartbase/base/mem_map.cc b/libartbase/base/mem_map.cc
index 03e8218..d8682e3 100644
--- a/libartbase/base/mem_map.cc
+++ b/libartbase/base/mem_map.cc
@@ -641,6 +641,14 @@
 
 void MemMap::swap(MemMap& other) {
   if (IsValid() || other.IsValid()) {
+    DCHECK(mem_maps_lock_ != nullptr);
+#ifdef __i386__
+    if (kIsDebugBuild) {
+      // For debugging purposes, log everything we can about the mutex, relying
+      // on the fact that mutexes are a wrapper around pthread_mutexes.
+      LOG(DEBUG) << "MemMap::swap: *lock = " << *reinterpret_cast<uint32_t*>(mem_maps_lock_);
+    }
+#endif
     std::lock_guard<std::mutex> mu(*mem_maps_lock_);
     DCHECK(gMaps != nullptr);
     auto this_it = IsValid() ? GetGMapsEntry(*this) : gMaps->end();
@@ -1008,6 +1016,11 @@
     delete gMaps;
     gMaps = nullptr;
   }
+#ifdef __i386__
+  if (kIsDebugBuild) {
+    LOG(DEBUG) << "MemMap::shutdown: Removing mem_maps_lock_.";
+  }
+#endif
   delete mem_maps_lock_;
   mem_maps_lock_ = nullptr;
 }