Constrain the zone segment pool size

src/zone/accounting-allocator.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/zone/accounting-allocator.h"
 
 #include <cstdlib>
 
 #if V8_LIBC_BIONIC
 #include <malloc.h>  // NOLINT
 #endif
 
 namespace v8 {
 namespace internal {
 
 AccountingAllocator::AccountingAllocator() : unused_segments_mutex_() {
+  static const uint8_t kDefaultBucketMaxSize = 5;

[jochen (gone - plz use gerrit), 2016/10/19 14:18:31]

also in this file, please don't unnecessarily constrain the bitwidth

+
   memory_pressure_level_.SetValue(MemoryPressureLevel::kNone);
-  std::fill(unused_segments_heads_,
-            unused_segments_heads_ +
-                (1 + kMaxSegmentSizePower - kMinSegmentSizePower),
+  std::fill(unused_segments_heads_, unused_segments_heads_ + kNumberBuckets,
             nullptr);
-  std::fill(
-      unused_segments_sizes,
-      unused_segments_sizes + (1 + kMaxSegmentSizePower - kMinSegmentSizePower),
-      0);
+  std::fill(unused_segments_sizes, unused_segments_sizes + kNumberBuckets, 0);
+  std::fill(unused_segments_max_sizes,
+            unused_segments_max_sizes + kNumberBuckets, kDefaultBucketMaxSize);
 }
 
 AccountingAllocator::~AccountingAllocator() { ClearPool(); }
 
 void AccountingAllocator::MemoryPressureNotification(
     MemoryPressureLevel level) {
   memory_pressure_level_.SetValue(level);
 
   if (level != MemoryPressureLevel::kNone) {
     ClearPool();
   }
 }
 
+void AccountingAllocator::ConfigureSegmentPool(const size_t max_pool_size) {
+  // The sum of the bytes of one segment of each size.
+  static const size_t full_size = (size_t(1) << (kMaxSegmentSizePower + 1)) -
+                                  (size_t(1) << kMinSegmentSizePower);
+  uint8_t fits_fully = max_pool_size / full_size;
+
+  base::LockGuard<base::Mutex> lock_guard(&unused_segments_mutex_);
+
+  size_t total_size = fits_fully * full_size;
+
+  for (uint8_t power = 0; power < kNumberBuckets; power++) {

[jochen (gone - plz use gerrit), 2016/10/19 14:18:31]

++power (same below)

+    if (total_size + (size_t(1) << power) <= max_pool_size) {
+      unused_segments_max_sizes[power] = fits_fully + 1;
+      total_size += size_t(1) << power;
+    } else {
+      unused_segments_max_sizes[power] = fits_fully;
+    }
+  }
+
+#if DEBUG
+  total_size = 0;
+  for (uint8_t power = 0; power < kNumberBuckets; power++) {
+    total_size += unused_segments_max_sizes[power] * (size_t(1) << power);
+  }
+  CHECK_LE(total_size, max_pool_size);

[jochen (gone - plz use gerrit), 2016/10/19 14:18:31]

this really should be a unit test

+#endif
+}
+
 Segment* AccountingAllocator::GetSegment(size_t bytes) {
   Segment* result = GetSegmentFromPool(bytes);
   if (result == nullptr) {
     result = AllocateSegment(bytes);
     result->Initialize(bytes);
   }
 
   return result;
 }
 
@@ skipping 82 matching lines @@
   uint8_t power = kMaxSegmentSizePower;
 
   while (size < (static_cast<size_t>(1) << power)) power--;
 
   DCHECK_GE(power, kMinSegmentSizePower + 0);
   power -= kMinSegmentSizePower;
 
   {
     base::LockGuard<base::Mutex> lock_guard(&unused_segments_mutex_);
 
-    if (unused_segments_sizes[power] >= kMaxSegmentsPerBucket) {
+    if (unused_segments_sizes[power] >= unused_segments_max_sizes[power]) {
       return false;
     }
 
     segment->set_next(unused_segments_heads_[power]);
     unused_segments_heads_[power] = segment;
     base::NoBarrier_AtomicIncrement(&current_pool_size_, size);
     unused_segments_sizes[power]++;
   }
 
   return true;
 }
 
 void AccountingAllocator::ClearPool() {
   base::LockGuard<base::Mutex> lock_guard(&unused_segments_mutex_);
 
   for (uint8_t power = 0; power <= kMaxSegmentSizePower - kMinSegmentSizePower;
        power++) {
     Segment* current = unused_segments_heads_[power];
     while (current) {
       Segment* next = current->next();
       FreeSegment(current);
       current = next;
     }
     unused_segments_heads_[power] = nullptr;
   }
 }
 
 }  // namespace internal
 }  // namespace v8