Reviewers: Hannes Payer,
Message:
Hi Hannes, sadly must revert due to a pile o' warnings. Rinse and repeat.
Description:
Revert "Grow big old generation slower."
This reverts commit r21700 due to Windows compile warnings.
[email protected]
Please review this at https://codereview.chromium.org/318763007/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+15, -17 lines):
M src/heap.h
M src/heap.cc
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
d2e034b8f87f6998c41a71984f7856469df01ee5..2271ae875585b7d4c1493cc66cb463013a3ad5a1
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -60,6 +60,7 @@ Heap::Heap()
// Will be 4 * reserved_semispace_size_ to ensure that young
// generation can be aligned to its size.
maximum_committed_(0),
+ old_space_growing_factor_(4),
survived_since_last_expansion_(0),
sweep_generation_(0),
always_allocate_scope_depth_(0),
@@ -5022,6 +5023,12 @@ bool Heap::ConfigureHeap(int max_semi_space_size,
code_range_size_ = code_range_size * MB;
+ // We set the old generation growing factor to 2 to grow the heap slower
on
+ // memory-constrained devices.
+ if (max_old_generation_size_ <= kMaxOldSpaceSizeMediumMemoryDevice) {
+ old_space_growing_factor_ = 2;
+ }
+
configured_ = true;
return true;
}
Index: src/heap.h
diff --git a/src/heap.h b/src/heap.h
index
7c5079f569be6ecb29737cec451c424aac940ed9..ccf212b4ed6726d5f355f135a9fa0ab7d0ccdeec
100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -1085,23 +1085,9 @@ class Heap {
700 * kPointerMultiplier;
intptr_t OldGenerationAllocationLimit(intptr_t old_gen_size) {
- intptr_t limit;
- if (FLAG_stress_compaction) {
- limit = old_gen_size + old_gen_size / 10;
- } else if (old_gen_size < max_old_generation_size_ / 8) {
- if (max_old_generation_size_ <= kMaxOldSpaceSizeMediumMemoryDevice) {
- limit = old_gen_size * 2;
- } else {
- limit = old_gen_size * 4;
- }
- } else if (old_gen_size < max_old_generation_size_ / 4) {
- limit = old_gen_size * 1.5;
- } else if (old_gen_size < max_old_generation_size_ / 2) {
- limit = old_gen_size * 1.2;
- } else {
- limit = old_gen_size * 1.1;
- }
-
+ intptr_t limit = FLAG_stress_compaction
+ ? old_gen_size + old_gen_size / 10
+ : old_gen_size * old_space_growing_factor_;
limit = Max(limit, kMinimumOldGenerationAllocationLimit);
limit += new_space_.Capacity();
intptr_t halfway_to_the_max = (old_gen_size +
max_old_generation_size_) / 2;
@@ -1526,6 +1512,11 @@ class Heap {
intptr_t max_executable_size_;
intptr_t maximum_committed_;
+ // The old space growing factor is used in the old space heap growing
+ // strategy. The new old space size is the current old space size times
+ // old_space_growing_factor_.
+ int old_space_growing_factor_;
+
// For keeping track of how much data has survived
// scavenge since last new space expansion.
int survived_since_last_expansion_;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
