commit aa6f6f1c86705fe3cedf929bd30d1e6f51524594
author Hans Boehm <hboehm@google.com> Thu Jan 30 17:36:29 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 30 21:33:55 2020 +0000
tree 68ebe2b07cc7dec80e153028750fbbf5bbc65050
parent 78815ee2caf62da310b98a6206b0bdbacf239ff3

Revert "Add temporary logging to MemMap::swap"

This reverts commit aea71ae52a6f846b39f89a3c395663f40b2f4184.

Reason for revert: Debug failure is elsewhere. And this was intended to be temporary anyway.

Change-Id: Ia349ba7282c3c8c94b5d50575ccc8d532eded6a9

libartbase/base/mem_map.cc

diff --git a/libartbase/base/mem_map.cc b/libartbase/base/mem_map.cc
index d8682e3..03e8218 100644
--- a/libartbase/base/mem_map.cc
+++ b/libartbase/base/mem_map.cc
@@ -641,14 +641,6 @@
 
 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();
@@ -1016,11 +1008,6 @@
     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;
 }