maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Sanitizers] Add more details to ASan allocator stats report. 

Summary: .

Reviewers: cryptoad

Subscribers: kubamracek, llvm-commits

Differential Revision: https://reviews.llvm.org/D38834

llvm-svn: 315730
This commit is contained in:
Alex Shlyapnikov 2017-10-13 18:38:10 +00:00
parent 9c6a31ae1d
commit 8a8d945df7
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler-rt/lib/asan/asan_memory_profile.cc
View File

@ -107,6 +107,9 @@ static void MemoryProfileCB(const SuspendedThreadsList &suspended_threads_list,
__lsan::ForEachChunk(ChunkCallback, &hp); __lsan::ForEachChunk(ChunkCallback, &hp);
uptr *Arg = reinterpret_cast<uptr*>(argument); uptr *Arg = reinterpret_cast<uptr*>(argument);
hp.Print(Arg[0], Arg[1]); hp.Print(Arg[0], Arg[1]);
if (Verbosity())
__asan_print_accumulated_stats();
} }
} // namespace __asan } // namespace __asan

24
compiler-rt/lib/sanitizer_common/sanitizer_allocator_primary64.h
View File

@ -223,11 +223,14 @@ class SizeClassAllocator64 {
uptr avail_chunks = region->allocated_user / ClassIdToSize(class_id); uptr avail_chunks = region->allocated_user / ClassIdToSize(class_id);
Printf( Printf(
"%s %02zd (%6zd): mapped: %6zdK allocs: %7zd frees: %7zd inuse: %6zd " "%s %02zd (%6zd): mapped: %6zdK allocs: %7zd frees: %7zd inuse: %6zd "
"num_freed_chunks %7zd avail: %6zd rss: %6zdK releases: %6zd\n", "num_freed_chunks %7zd avail: %6zd rss: %6zdK releases: %6zd "
"last released: %6zdK region: 0x%zx\n",
region->exhausted ? "F" : " ", class_id, ClassIdToSize(class_id), region->exhausted ? "F" : " ", class_id, ClassIdToSize(class_id),
region->mapped_user >> 10, region->stats.n_allocated, region->mapped_user >> 10, region->stats.n_allocated,
region->stats.n_freed, in_use, region->num_freed_chunks, avail_chunks, region->stats.n_freed, in_use, region->num_freed_chunks, avail_chunks,
rss >> 10, region->rtoi.num_releases); rss >> 10, region->rtoi.num_releases,
region->rtoi.last_released_bytes >> 10,
SpaceBeg() + kRegionSize * class_id);
} }
void PrintStats() { void PrintStats() {
@ -563,6 +566,7 @@ class SizeClassAllocator64 {
uptr n_freed_at_last_release; uptr n_freed_at_last_release;
uptr num_releases; uptr num_releases;
u64 last_release_at_ns; u64 last_release_at_ns;
u64 last_released_bytes;
}; };
struct RegionInfo { struct RegionInfo {
@ -739,13 +743,18 @@ class SizeClassAllocator64 {
MemoryMapper(const ThisT& base_allocator, uptr class_id) MemoryMapper(const ThisT& base_allocator, uptr class_id)
: allocator(base_allocator), : allocator(base_allocator),
region_base(base_allocator.GetRegionBeginBySizeClass(class_id)), region_base(base_allocator.GetRegionBeginBySizeClass(class_id)),
released_ranges_count(0) { released_ranges_count(0),
released_bytes(0) {
} }
uptr GetReleasedRangesCount() const { uptr GetReleasedRangesCount() const {
return released_ranges_count; return released_ranges_count;
} }
uptr GetReleasedBytes() const {
return released_bytes;
}
uptr MapPackedCounterArrayBuffer(uptr buffer_size) { uptr MapPackedCounterArrayBuffer(uptr buffer_size) {
// TODO(alekseyshl): The idea to explore is to check if we have enough // TODO(alekseyshl): The idea to explore is to check if we have enough
// space between num_freed_chunks*sizeof(CompactPtrT) and // space between num_freed_chunks*sizeof(CompactPtrT) and
@ -761,16 +770,18 @@ class SizeClassAllocator64 {
// Releases [from, to) range of pages back to OS. // Releases [from, to) range of pages back to OS.
void ReleasePageRangeToOS(CompactPtrT from, CompactPtrT to) { void ReleasePageRangeToOS(CompactPtrT from, CompactPtrT to) {
ReleaseMemoryPagesToOS( const uptr from_page = allocator.CompactPtrToPointer(region_base, from);
allocator.CompactPtrToPointer(region_base, from), const uptr to_page = allocator.CompactPtrToPointer(region_base, to);
allocator.CompactPtrToPointer(region_base, to)); ReleaseMemoryPagesToOS(from_page, to_page);
released_ranges_count++; released_ranges_count++;
released_bytes += to_page - from_page;
} }
private: private:
const ThisT& allocator; const ThisT& allocator;
const uptr region_base; const uptr region_base;
uptr released_ranges_count; uptr released_ranges_count;
uptr released_bytes;
}; };
// Attempts to release RAM occupied by freed chunks back to OS. The region is // Attempts to release RAM occupied by freed chunks back to OS. The region is
@ -805,6 +816,7 @@ class SizeClassAllocator64 {
if (memory_mapper.GetReleasedRangesCount() > 0) { if (memory_mapper.GetReleasedRangesCount() > 0) {
region->rtoi.n_freed_at_last_release = region->stats.n_freed; region->rtoi.n_freed_at_last_release = region->stats.n_freed;
region->rtoi.num_releases += memory_mapper.GetReleasedRangesCount(); region->rtoi.num_releases += memory_mapper.GetReleasedRangesCount();
region->rtoi.last_released_bytes = memory_mapper.GetReleasedBytes();
} }
region->rtoi.last_release_at_ns = NanoTime(); region->rtoi.last_release_at_ns = NanoTime();
} }