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/mem_map.h | |
| 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/mem_map.h')
| -rw-r--r-- | runtime/mem_map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mem_map.h b/runtime/mem_map.h index dc6d935..6023a70 100644 --- a/runtime/mem_map.h +++ b/runtime/mem_map.h @@ -137,7 +137,7 @@ class MemMap { static bool CheckNoGaps(MemMap* begin_map, MemMap* end_map) LOCKS_EXCLUDED(Locks::mem_maps_lock_); - static void DumpMaps(std::ostream& os) + static void DumpMaps(std::ostream& os, bool terse = false) LOCKS_EXCLUDED(Locks::mem_maps_lock_); typedef AllocationTrackingMultiMap<void*, MemMap*, kAllocatorTagMaps> Maps; @@ -149,7 +149,7 @@ class MemMap { MemMap(const std::string& name, uint8_t* begin, size_t size, void* base_begin, size_t base_size, int prot, bool reuse) LOCKS_EXCLUDED(Locks::mem_maps_lock_); - static void DumpMapsLocked(std::ostream& os) + static void DumpMapsLocked(std::ostream& os, bool terse) EXCLUSIVE_LOCKS_REQUIRED(Locks::mem_maps_lock_); static bool HasMemMap(MemMap* map) EXCLUSIVE_LOCKS_REQUIRED(Locks::mem_maps_lock_); |