Updates for comments.

Author: cferris1000

compiler-rt/lib/scudo/standalone/allocator_config.def

@@ -83,7 +83,7 @@ PRIMARY_REQUIRED(const s32, MaxReleaseToOsIntervalMs)
 //
 
 // Enables/disables primary block caching. Batch class still caches.
-PRIMARY_OPTIONAL(const bool, EnableCache, true)
+PRIMARY_OPTIONAL(const bool, EnableBlockCache, true)
 
 // The scale of a compact pointer. E.g., Ptr = Base + (CompactPtr << Scale).
 PRIMARY_OPTIONAL(const uptr, CompactPtrScale, SCUDO_MIN_ALIGNMENT_LOG)

compiler-rt/lib/scudo/standalone/primary32.h

@@ -53,7 +53,7 @@ template <typename Config> class SizeClassAllocator32 {
                 "");
   typedef SizeClassAllocator32<Config> ThisT;
   using SizeClassAllocatorT =
-      typename Conditional<Config::getEnableCache(),
+      typename Conditional<Config::getEnableBlockCache(),
                            SizeClassAllocatorLocalCache<ThisT>,
                            SizeClassAllocatorNoCache<ThisT>>::type;
   typedef TransferBatch<ThisT> TransferBatchT;

compiler-rt/lib/scudo/standalone/primary64.h

@@ -60,7 +60,7 @@ template <typename Config> class SizeClassAllocator64 {
   typedef TransferBatch<ThisT> TransferBatchT;
   typedef BatchGroup<ThisT> BatchGroupT;
   using SizeClassAllocatorT =
-      typename Conditional<Config::getEnableCache(),
+      typename Conditional<Config::getEnableBlockCache(),
                            SizeClassAllocatorLocalCache<ThisT>,
                            SizeClassAllocatorNoCache<ThisT>>::type;
 

compiler-rt/lib/scudo/standalone/size_class_allocator.h

@@ -225,7 +225,7 @@ template <class SizeClassAllocator> struct SizeClassAllocatorNoCache {
     // in SizeClassAllocatorLocalCache so that use the same hint when doing
     // a page release.
     ++C->Count;
-    const bool SuggestDraining = C->Count == C->MaxCount;
+    const bool SuggestDraining = C->Count >= C->MaxCount;
     if (SuggestDraining)
       C->Count = 0;
     return SuggestDraining;
@@ -292,7 +292,7 @@ template <class SizeClassAllocator> struct SizeClassAllocatorNoCache {
   bool deallocateBatchClassBlock(void *P) {
     PerClass *C = &PerClassArray[BatchClassId];
     // Drain all the blocks.
-    if (C->Count == C->MaxCount) {
+    if (C->Count >= C->MaxCount) {
       Allocator->pushBlocks(this, BatchClassId, BatchClassStorage, C->Count);
       C->Count = 0;
     }

compiler-rt/lib/scudo/standalone/tests/combined_test.cpp

@@ -233,7 +233,7 @@ struct TestNoCacheConfig {
     static const scudo::uptr GroupSizeLog = 18U;
     typedef scudo::uptr CompactPtrT;
 #endif
-    static const bool EnableCache = false;
+    static const bool EnableBlockCache = false;
     static const scudo::s32 MinReleaseToOsIntervalMs = 1000;
     static const scudo::s32 MaxReleaseToOsIntervalMs = 1000;
   };