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_pool.cc | |
parent | 0772a9d99c8774463c9076824340eaa4eb66f47f (diff) | |
download | art-bad0267eaab9d6a522d05469ff90501deefdb88b.zip art-bad0267eaab9d6a522d05469ff90501deefdb88b.tar.gz art-bad0267eaab9d6a522d05469ff90501deefdb88b.tar.bz2 |
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_pool.cc')
-rw-r--r-- | runtime/monitor_pool.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/monitor_pool.cc b/runtime/monitor_pool.cc index 4964aa0..4a364ca 100644 --- a/runtime/monitor_pool.cc +++ b/runtime/monitor_pool.cc @@ -57,7 +57,7 @@ void MonitorPool::AllocateChunk() { } // Allocate the chunk. - void* chunk = malloc(kChunkSize); + void* chunk = allocator_.allocate(kChunkSize); // Check we allocated memory. CHECK_NE(reinterpret_cast<uintptr_t>(nullptr), reinterpret_cast<uintptr_t>(chunk)); // Check it is aligned as we need it. @@ -131,7 +131,7 @@ void MonitorPool::ReleaseMonitorToPool(Thread* self, Monitor* monitor) { monitor->monitor_id_ = id; } -void MonitorPool::ReleaseMonitorsToPool(Thread* self, std::list<Monitor*>* monitors) { +void MonitorPool::ReleaseMonitorsToPool(Thread* self, MonitorList::Monitors* monitors) { for (Monitor* mon : *monitors) { ReleaseMonitorToPool(self, mon); } |