Index: src/zone/accounting-allocator.cc |
diff --git a/src/zone/accounting-allocator.cc b/src/zone/accounting-allocator.cc |
index 623cb5718af5148cda57bfd015959bee1b7ff357..1b23f95876318e159a4bef1b4b82983988a5ec72 100644 |
--- a/src/zone/accounting-allocator.cc |
+++ b/src/zone/accounting-allocator.cc |
@@ -13,6 +13,43 @@ |
namespace v8 { |
namespace internal { |
+AccountingAllocator::AccountingAllocator() { |
+ memory_pressure_level_.SetValue(MemoryPressureLevel::kNone); |
+ std::fill(unused_segments_heads_, |
+ unused_segments_heads_ + |
+ (1 + kMaxSegmentSizePower - kMinSegmentSizePower), |
+ nullptr); |
+ std::fill( |
+ unused_segments_sizes, |
+ unused_segments_sizes + (1 + kMaxSegmentSizePower - kMinSegmentSizePower), |
+ 0); |
+} |
+ |
+AccountingAllocator::~AccountingAllocator() { |
+ ClearPool(); |
+ delete[] unused_segments_heads_; |
+ delete[] unused_segments_sizes; |
+ delete unused_segments_mutex_; |
+} |
+ |
+void AccountingAllocator::MemoryPressureNotification( |
+ MemoryPressureLevel level) { |
+ memory_pressure_level_.SetValue(level); |
+ |
+ if (level != MemoryPressureLevel::kNone) { |
+ ClearPool(); |
+ } |
+} |
+ |
+Segment* AccountingAllocator::GetSegment(size_t bytes) { |
+ Segment* result = GetSegmentFromPool(bytes); |
+ if (result == nullptr) { |
+ result = AllocateSegment(bytes); |
+ } |
+ |
+ return result; |
+} |
+ |
Segment* AccountingAllocator::AllocateSegment(size_t bytes) { |
void* memory = malloc(bytes); |
if (memory) { |
@@ -26,9 +63,19 @@ Segment* AccountingAllocator::AllocateSegment(size_t bytes) { |
return reinterpret_cast<Segment*>(memory); |
} |
+void AccountingAllocator::ReturnSegment(Segment* segment) { |
+ segment->ZapContents(); |
+ if (memory_pressure_level_.Value() != MemoryPressureLevel::kNone) { |
+ FreeSegment(segment); |
+ } else if (!AddSegmentToPool(segment)) { |
+ FreeSegment(segment); |
+ } |
+} |
+ |
void AccountingAllocator::FreeSegment(Segment* memory) { |
base::NoBarrier_AtomicIncrement( |
¤t_memory_usage_, -static_cast<base::AtomicWord>(memory->size())); |
+ memory->ZapHeader(); |
free(memory); |
} |
@@ -40,5 +87,95 @@ size_t AccountingAllocator::GetMaxMemoryUsage() const { |
return base::NoBarrier_Load(&max_memory_usage_); |
} |
+Segment* AccountingAllocator::GetSegmentFromPool(size_t requested_size) { |
+ if (requested_size > 1 << kMaxSegmentSizePower) { |
+ return nullptr; |
+ } |
+ |
+ uint8_t power = kMinSegmentSizePower; |
+ while (requested_size > static_cast<size_t>(1 << power)) power++; |
+ |
+ power -= kMinSegmentSizePower; |
+ |
+ DCHECK_GE(power, 0); |
+ |
+ Segment* segment; |
+ { |
+ base::LockGuard<base::Mutex> lock_guard(unused_segments_mutex_); |
+ |
+ segment = unused_segments_heads_[power]; |
+ |
+ if (segment) { |
+ unused_segments_heads_[power] = segment->next(); |
+ segment->set_next(nullptr); |
+ |
+ unused_segments_sizes[power]--; |
+ unused_segments_size_ -= segment->size(); |
+ } |
+ } |
+ |
+ if (segment) { |
+ DCHECK_GE(segment->size(), requested_size); |
+ // PrintF("%f; 0;-%lu\n", static_cast<double>(clock() - begin) / |
+ // CLOCKS_PER_SEC, segment->size()); |
+ } |
+ return segment; |
+} |
+ |
+bool AccountingAllocator::AddSegmentToPool(Segment* segment) { |
+ size_t size = segment->size(); |
+ |
+ if (size >= (1 << (kMaxSegmentSizePower + 1))) { |
+ return false; |
+ } |
+ |
+ if (size < (1 << kMinSegmentSizePower)) { |
+ return false; |
+ } |
+ |
+ uint8_t power = kMaxSegmentSizePower; |
+ |
+ while (size < static_cast<size_t>(1 << power)) power--; |
+ |
+ power -= kMinSegmentSizePower; |
+ |
+ DCHECK_GE(power, 0); |
+ |
+ { |
+ base::LockGuard<base::Mutex> lock_guard(unused_segments_mutex_); |
+ |
+ if (unused_segments_sizes[power] >= kMaxSegmentsPerBucket) { |
+ return false; |
+ } |
+ |
+ segment->set_next(unused_segments_heads_[power]); |
+ unused_segments_heads_[power] = segment; |
+ unused_segments_size_ += size; |
+ unused_segments_sizes[power]++; |
+ } |
+ |
+ // PrintF("%f; 0;+%lu\n", static_cast<double>(clock() - begin) / |
+ // CLOCKS_PER_SEC, size); |
+ |
+ 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 |