[llvm-commits] [compiler-rt] r169506 - in /compiler-rt/trunk/lib/sanitizer_common: sanitizer_allocator.h tests/sanitizer_allocator_test.cc

[Kostya Serebryany]

Author: kcc
Date: Thu Dec  6 08:27:32 2012
New Revision: 169506

URL: http://llvm.org/viewvc/llvm-project?rev=169506&view=rev
Log:
[asan/msan] add BulkAllocate to the 32-bit allocator (and a test)

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h
    compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h?rev=169506&r1=169505&r2=169506&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.h Thu Dec  6 08:27:32 2012
@@ -366,6 +366,22 @@
     return reinterpret_cast<void*>(meta);
   }
 
+  // Allocate several chunks of the given class_id.
+  void BulkAllocate(uptr class_id, AllocatorFreeList *free_list) {
+    SizeClassInfo *sci = GetSizeClassInfo(class_id);
+    SpinMutexLock l(&sci->mutex);
+    EnsureSizeClassHasAvailableChunks(sci, class_id);
+    CHECK(!sci->free_list.empty());
+    sci->free_list.BulkAllocate(SizeClassMap::MaxCached(class_id), free_list);
+  }
+
+  // Swallow the entire free_list for the given class_id.
+  void BulkDeallocate(uptr class_id, AllocatorFreeList *free_list) {
+    SizeClassInfo *sci = GetSizeClassInfo(class_id);
+    SpinMutexLock l(&sci->mutex);
+    sci->free_list.append_front(free_list);
+  }
+
   bool PointerIsMine(void *p) {
     return possible_regions_[ComputeRegionId(reinterpret_cast<uptr>(p))] != 0;
   }
@@ -390,6 +406,8 @@
     return SizeClassMap::Size(GetSizeClass(p));
   }
 
+  uptr ClassID(uptr size) { return SizeClassMap::ClassID(size); }
+
   uptr TotalMemoryUsed() {
     // No need to lock here.
     uptr res = 0;

Modified: compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc?rev=169506&r1=169505&r2=169506&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/tests/sanitizer_allocator_test.cc Thu Dec  6 08:27:32 2012
@@ -255,17 +255,20 @@
 template
 <class PrimaryAllocator, class SecondaryAllocator, class AllocatorCache>
 void TestCombinedAllocator() {
-  CombinedAllocator<PrimaryAllocator, AllocatorCache, SecondaryAllocator> a;
-  a.Init();
+  typedef
+      CombinedAllocator<PrimaryAllocator, AllocatorCache, SecondaryAllocator>
+      Allocator;
+  Allocator *a = new Allocator;
+  a->Init();
 
   AllocatorCache cache;
   cache.Init();
 
-  EXPECT_EQ(a.Allocate(&cache, -1, 1), (void*)0);
-  EXPECT_EQ(a.Allocate(&cache, -1, 1024), (void*)0);
-  EXPECT_EQ(a.Allocate(&cache, (uptr)-1 - 1024, 1), (void*)0);
-  EXPECT_EQ(a.Allocate(&cache, (uptr)-1 - 1024, 1024), (void*)0);
-  EXPECT_EQ(a.Allocate(&cache, (uptr)-1 - 1023, 1024), (void*)0);
+  EXPECT_EQ(a->Allocate(&cache, -1, 1), (void*)0);
+  EXPECT_EQ(a->Allocate(&cache, -1, 1024), (void*)0);
+  EXPECT_EQ(a->Allocate(&cache, (uptr)-1 - 1024, 1), (void*)0);
+  EXPECT_EQ(a->Allocate(&cache, (uptr)-1 - 1024, 1024), (void*)0);
+  EXPECT_EQ(a->Allocate(&cache, (uptr)-1 - 1023, 1024), (void*)0);
 
   const uptr kNumAllocs = 100000;
   const uptr kNumIter = 10;
@@ -275,8 +278,8 @@
       uptr size = (i % (1 << 14)) + 1;
       if ((i % 1024) == 0)
         size = 1 << (10 + (i % 14));
-      void *x = a.Allocate(&cache, size, 1);
-      uptr *meta = reinterpret_cast<uptr*>(a.GetMetaData(x));
+      void *x = a->Allocate(&cache, size, 1);
+      uptr *meta = reinterpret_cast<uptr*>(a->GetMetaData(x));
       CHECK_EQ(*meta, 0);
       *meta = size;
       allocated.push_back(x);
@@ -286,26 +289,38 @@
 
     for (uptr i = 0; i < kNumAllocs; i++) {
       void *x = allocated[i];
-      uptr *meta = reinterpret_cast<uptr*>(a.GetMetaData(x));
+      uptr *meta = reinterpret_cast<uptr*>(a->GetMetaData(x));
       CHECK_NE(*meta, 0);
-      CHECK(a.PointerIsMine(x));
+      CHECK(a->PointerIsMine(x));
       *meta = 0;
-      a.Deallocate(&cache, x);
+      a->Deallocate(&cache, x);
     }
     allocated.clear();
-    a.SwallowCache(&cache);
+    a->SwallowCache(&cache);
   }
-  a.TestOnlyUnmap();
+  a->TestOnlyUnmap();
 }
 
 #if SANITIZER_WORDSIZE == 64
-TEST(SanitizerCommon, CombinedAllocator) {
+TEST(SanitizerCommon, CombinedAllocator64) {
   TestCombinedAllocator<Allocator64,
       LargeMmapAllocator,
       SizeClassAllocatorLocalCache<Allocator64> > ();
 }
+
+TEST(SanitizerCommon, CombinedAllocator64Compact) {
+  TestCombinedAllocator<Allocator64Compact,
+      LargeMmapAllocator,
+      SizeClassAllocatorLocalCache<Allocator64Compact> > ();
+}
 #endif
 
+TEST(SanitizerCommon, CombinedAllocator32Compact) {
+  TestCombinedAllocator<Allocator32Compact,
+      LargeMmapAllocator,
+      SizeClassAllocatorLocalCache<Allocator32Compact> > ();
+}
+
 template <class AllocatorCache>
 void TestSizeClassAllocatorLocalCache() {
   static THREADLOCAL AllocatorCache static_allocator_cache;