diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-08-25 13:08:22 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2014-08-29 18:57:35 -0700 |
commit | bad0267eaab9d6a522d05469ff90501deefdb88b (patch) | |
tree | 1ce689b75184cb322b9edde34d7af938c658a6ae /runtime/monitor.h | |
parent | 0772a9d99c8774463c9076824340eaa4eb66f47f (diff) | |
download | art-bad0267eaab9d6a522d05469ff90501deefdb88b.tar.gz art-bad0267eaab9d6a522d05469ff90501deefdb88b.tar.bz2 art-bad0267eaab9d6a522d05469ff90501deefdb88b.zip |
Add native memory accounting through custom allocator.
Added a custom allocator that lets you pass in a special tag which
specifices where the allocation came from. This is used when
dumping. The performance overhead is low since each allocation only
does a atomic add/sub for each allocation/free.
The measurements are dumped to traces.txt during SIGQUIT.
Example output:
I/art (27274): AllocatorTagHeap active=120 max=120 total=168
I/art (27274): AllocatorTagMonitorList active=1572 max=6240 total=11724
I/art (27274): AllocatorTagClassTable active=185208 max=185208 total=268608
I/art (27274): AllocatorTagInternTable active=430368 max=430368 total=436080
I/art (27274): AllocatorTagMaps active=5616 max=6168 total=34392
I/art (27274): AllocatorTagLOS active=1024 max=1536 total=2044
I/art (27274): AllocatorTagSafeMap active=0 max=51936 total=533688
I/art (27274): AllocatorTagLOSMaps active=144 max=1248 total=5760
I/art (27274): AllocatorTagReferenceTable active=10944 max=11840 total=19136
I/art (27274): AllocatorTagHeapBitmap active=32 max=40 total=56
I/art (27274): AllocatorTagHeapBitmapLOS active=8 max=8 total=8
I/art (27274): AllocatorTagVerifier active=0 max=18844 total=1073156
I/art (27274): AllocatorTagModUnionCardSet active=5300 max=5920 total=56020
I/art (27274): AllocatorTagModUnionReferenceArray active=24864 max=24864 total=24864
I/art (27274): AllocatorTagJNILibrarires active=320 max=320 total=320
I/art (27274): AllocatorTagOatFile active=1400 max=1400 total=5852
Change-Id: Ibb470ef2e9c9a24563bb46422d46a55799704d82
(cherry picked from commit 5369c40f75fdcb1be7a7c06db212ce965c83a164)
Diffstat (limited to 'runtime/monitor.h')
-rw-r--r-- | runtime/monitor.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index efa83c70c5..8f97a40c0f 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -25,6 +25,7 @@ #include <vector> #include "atomic.h" +#include "base/allocator.h" #include "base/mutex.h" #include "gc_root.h" #include "object_callbacks.h" @@ -275,6 +276,8 @@ class MonitorList { size_t DeflateMonitors() LOCKS_EXCLUDED(monitor_list_lock_) EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_); + typedef std::list<Monitor*, TrackingAllocator<Monitor*, kAllocatorTagMonitorList>> Monitors; + private: // During sweeping we may free an object and on a separate thread have an object created using // the newly freed memory. That object may then have its lock-word inflated and a monitor created. @@ -283,7 +286,7 @@ class MonitorList { bool allow_new_monitors_ GUARDED_BY(monitor_list_lock_); Mutex monitor_list_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; ConditionVariable monitor_add_condition_ GUARDED_BY(monitor_list_lock_); - std::list<Monitor*> list_ GUARDED_BY(monitor_list_lock_); + Monitors list_ GUARDED_BY(monitor_list_lock_); friend class Monitor; DISALLOW_COPY_AND_ASSIGN(MonitorList); |