debug_utils_(NULL),
#endif // DEBUG
new_space_high_promotion_mode_active_(false),
- old_gen_promotion_limit_(kMinimumPromotionLimit),
- old_gen_allocation_limit_(kMinimumAllocationLimit),
+ old_gen_promotion_limit_(kMinPromotionLimit),
+ old_gen_allocation_limit_(kMinAllocationLimit),
old_gen_limit_factor_(1),
size_of_old_gen_at_last_old_space_gc_(0),
external_allocation_limit_(0),
}
old_gen_promotion_limit_ =
- OldGenPromotionLimit(size_of_old_gen_at_last_old_space_gc_);
+ OldGenLimit(size_of_old_gen_at_last_old_space_gc_, kMinPromotionLimit);
old_gen_allocation_limit_ =
- OldGenAllocationLimit(size_of_old_gen_at_last_old_space_gc_);
+ OldGenLimit(size_of_old_gen_at_last_old_space_gc_, kMinAllocationLimit);
old_gen_exhausted_ = false;
} else {
return max_old_generation_size_ - PromotedTotalSize();
}
- static const intptr_t kMinimumPromotionLimit = 5 * Page::kPageSize;
- static const intptr_t kMinimumAllocationLimit =
+ static const intptr_t kMinPromotionLimit = 5 * Page::kPageSize;
+ static const intptr_t kMinAllocationLimit =
8 * (Page::kPageSize > MB ? Page::kPageSize : MB);
- intptr_t OldGenPromotionLimit(intptr_t old_gen_size) {
- const int divisor = FLAG_stress_compaction ? 10 : 3;
- intptr_t limit =
- Max(old_gen_size + old_gen_size / divisor, kMinimumPromotionLimit);
- limit += new_space_.Capacity();
- limit *= old_gen_limit_factor_;
- intptr_t halfway_to_the_max = (old_gen_size + max_old_generation_size_) / 2;
- return Min(limit, halfway_to_the_max);
- }
-
- intptr_t OldGenAllocationLimit(intptr_t old_gen_size) {
+ intptr_t OldGenLimit(intptr_t old_gen_size, intptr_t min_limit) {
const int divisor = FLAG_stress_compaction ? 8 : 2;
- intptr_t limit =
- Max(old_gen_size + old_gen_size / divisor, kMinimumAllocationLimit);
+ intptr_t limit = Max(old_gen_size + old_gen_size / divisor, min_limit);
limit += new_space_.Capacity();
limit *= old_gen_limit_factor_;
intptr_t halfway_to_the_max = (old_gen_size + max_old_generation_size_) / 2;
intptr_t old_space_size = heap()->PromotedSpaceSizeOfObjects();
intptr_t space_left =
- Min(heap()->OldGenPromotionLimit(old_space_size),
- heap()->OldGenAllocationLimit(old_space_size)) - old_space_size;
+ Min(heap()->OldGenLimit(old_space_size, Heap::kMinPromotionLimit),
+ heap()->OldGenLimit(old_space_size, Heap::kMinAllocationLimit)) -
+ old_space_size;
while (it.has_next()) {
Page* p = it.next();