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

[asan/msan] one more test for 32-bit allocator + minor code simplification 

llvm-svn: 169507
This commit is contained in:
Kostya Serebryany 2012-12-06 14:39:41 +00:00
parent c14ae88b08
commit 6d2d30f61d
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/lib/sanitizer_common/sanitizer_allocator.h
View File

@ -149,7 +149,7 @@ class SizeClassAllocator64 {
void *Allocate(uptr size, uptr alignment) { void *Allocate(uptr size, uptr alignment) {
if (size < alignment) size = alignment; if (size < alignment) size = alignment;
CHECK(CanAllocate(size, alignment)); CHECK(CanAllocate(size, alignment));
return AllocateBySizeClass(SizeClassMap::ClassID(size)); return AllocateBySizeClass(ClassID(size));
} }
void Deallocate(void *p) { void Deallocate(void *p) {
@ -347,7 +347,7 @@ class SizeClassAllocator32 {
void *Allocate(uptr size, uptr alignment) { void *Allocate(uptr size, uptr alignment) {
if (size < alignment) size = alignment; if (size < alignment) size = alignment;
CHECK(CanAllocate(size, alignment)); CHECK(CanAllocate(size, alignment));
return AllocateBySizeClass(SizeClassMap::ClassID(size)); return AllocateBySizeClass(ClassID(size));
} }
void Deallocate(void *p) { void Deallocate(void *p) {

26
compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
View File

@ -326,9 +326,10 @@ void TestSizeClassAllocatorLocalCache() {
static THREADLOCAL AllocatorCache static_allocator_cache; static THREADLOCAL AllocatorCache static_allocator_cache;
static_allocator_cache.Init(); static_allocator_cache.Init();
AllocatorCache cache; AllocatorCache cache;
typename AllocatorCache::Allocator a; typedef typename AllocatorCache::Allocator Allocator;
Allocator *a = new Allocator();
a.Init(); a->Init();
cache.Init(); cache.Init();
const uptr kNumAllocs = 10000; const uptr kNumAllocs = 10000;
@ -337,19 +338,20 @@ void TestSizeClassAllocatorLocalCache() {
for (int i = 0; i < kNumIter; i++) { for (int i = 0; i < kNumIter; i++) {
void *allocated[kNumAllocs]; void *allocated[kNumAllocs];
for (uptr i = 0; i < kNumAllocs; i++) { for (uptr i = 0; i < kNumAllocs; i++) {
allocated[i] = cache.Allocate(&a, 0); allocated[i] = cache.Allocate(a, 0);
} }
for (uptr i = 0; i < kNumAllocs; i++) { for (uptr i = 0; i < kNumAllocs; i++) {
cache.Deallocate(&a, 0, allocated[i]); cache.Deallocate(a, 0, allocated[i]);
} }
cache.Drain(&a); cache.Drain(a);
uptr total_allocated = a.TotalMemoryUsed(); uptr total_allocated = a->TotalMemoryUsed();
if (saved_total) if (saved_total)
CHECK_EQ(saved_total, total_allocated); CHECK_EQ(saved_total, total_allocated);
saved_total = total_allocated; saved_total = total_allocated;
} }
a.TestOnlyUnmap(); a->TestOnlyUnmap();
delete a;
} }
#if SANITIZER_WORDSIZE == 64 #if SANITIZER_WORDSIZE == 64
@ -357,8 +359,18 @@ TEST(SanitizerCommon, SizeClassAllocator64LocalCache) {
TestSizeClassAllocatorLocalCache< TestSizeClassAllocatorLocalCache<
SizeClassAllocatorLocalCache<Allocator64> >(); SizeClassAllocatorLocalCache<Allocator64> >();
} }
TEST(SanitizerCommon, SizeClassAllocator64CompactLocalCache) {
TestSizeClassAllocatorLocalCache<
SizeClassAllocatorLocalCache<Allocator64Compact> >();
}
#endif #endif
TEST(SanitizerCommon, SizeClassAllocator32CompactLocalCache) {
TestSizeClassAllocatorLocalCache<
SizeClassAllocatorLocalCache<Allocator32Compact> >();
}
TEST(Allocator, Basic) { TEST(Allocator, Basic) {
char *p = (char*)InternalAlloc(10); char *p = (char*)InternalAlloc(10);
EXPECT_NE(p, (char*)0); EXPECT_NE(p, (char*)0);