diff options
author | Vladimir Marko <vmarko@google.com> | 2015-05-08 15:17:32 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2015-05-08 22:38:48 +0100 |
commit | dd5a4d0a9cdf75e8fffc3cc3a08c808bbd997b22 (patch) | |
tree | 014ba0947dc04c2c09a52605139933d243a5e3b8 /runtime/gc | |
parent | 8ee43e3ce18e90bfbf8cbeb05ff78ad281015d1a (diff) | |
download | art-dd5a4d0a9cdf75e8fffc3cc3a08c808bbd997b22.zip art-dd5a4d0a9cdf75e8fffc3cc3a08c808bbd997b22.tar.gz art-dd5a4d0a9cdf75e8fffc3cc3a08c808bbd997b22.tar.bz2 |
ART: Merge entries with same name and protect in MemMap dump.
This should make the MemMap dump less chatty and allow the
logger to keep more relevant output.
Bug: 20873174
(cherry picked from commit 17a924abde2b0f1f37f6008b451a0a75190c71ff)
Change-Id: I1748f57a1f149a5498b42ee246f13d2bf1e8c2f7
Diffstat (limited to 'runtime/gc')
-rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 2 | ||||
-rw-r--r-- | runtime/gc/heap.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index 1068e90..55a8411 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -385,7 +385,7 @@ class MarkSweepMarkObjectSlowPath { LOG(INTERNAL_FATAL) << "Attempting see if it's a bad root"; mark_sweep_->VerifyRoots(); PrintFileToLog("/proc/self/maps", LogSeverity::INTERNAL_FATAL); - MemMap::DumpMaps(LOG(INTERNAL_FATAL)); + MemMap::DumpMaps(LOG(INTERNAL_FATAL), true); LOG(FATAL) << "Can't mark invalid object"; } } diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index cbbc76c..4129d75 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -491,7 +491,7 @@ Heap::Heap(size_t initial_size, size_t growth_limit, size_t min_free, size_t max bool no_gap = MemMap::CheckNoGaps(GetImageSpace()->GetMemMap(), non_moving_space_->GetMemMap()); if (!no_gap) { - MemMap::DumpMaps(LOG(ERROR)); + MemMap::DumpMaps(LOG(ERROR), true); LOG(FATAL) << "There's a gap between the image space and the non-moving space"; } } |