Reviewers: Lasse Reichstein,
Message:
PTAL.
Description:
Fix new space shrinking to reset from space.
[email protected]
BUG=v8:1702
TEST=cctest/test-heap/GrowAndShrinkNewSpace
Please review this at http://codereview.chromium.org/7976003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/spaces.cc
M test/cctest/test-heap.cc
Index: src/spaces.cc
diff --git a/src/spaces.cc b/src/spaces.cc
index
adfb74a4efeabf9868a7be678c15dcb6b4603141..0f48afd840c4868263d2923627b3663c721ed364
100644
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -947,6 +947,7 @@ void NewSpace::Shrink() {
if (rounded_new_capacity < Capacity() &&
to_space_.ShrinkTo(rounded_new_capacity)) {
// Only shrink from space if we managed to shrink to space.
+ from_space_.Reset();
if (!from_space_.ShrinkTo(rounded_new_capacity)) {
// If we managed to shrink to space but couldn't shrink from
// space, attempt to grow to space again.
Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index
28933fb86beaa169eb0b19e76241a4d6e2132ef3..86be15a5ca272aad04ad804ad589c322f7ca31a4
100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -1221,6 +1221,50 @@ TEST(TestSizeOfObjectsVsHeapIteratorPrecision) {
}
+TEST(GrowAndShrinkNewSpace) {
+ InitializeVM();
+ v8::HandleScope scope;
+ NewSpace* new_space = HEAP->new_space();
+
+ // Explicitly growing should double the space capacity.
+ int old_capacity, new_capacity;
+ old_capacity = new_space->Capacity();
+ new_space->Grow();
+ new_capacity = new_space->Capacity();
+ ASSERT_EQ(2 * old_capacity, new_capacity);
+
+ // Fill up new space to the point that it exceeds old capacity.
+ while (new_space->SizeAsInt() <= old_capacity) {
+ Handle<FixedArray> filler = FACTORY->NewFixedArray(1000, NOT_TENURED);
+ ASSERT(HEAP->InNewSpace(*FACTORY->NewFixedArray(1000, NOT_TENURED)));
+ }
+
+ // Explicitly shrinking should not affect space capacity.
+ old_capacity = new_space->Capacity();
+ new_space->Shrink();
+ new_capacity = new_space->Capacity();
+ ASSERT_EQ(old_capacity, new_capacity);
+
+ // Perform scavenge to empty the new space.
+ HEAP->CollectGarbage(NEW_SPACE);
+ ASSERT_LE(new_space->SizeAsInt(), old_capacity);
+
+ // Explicitly shrinking should halve the space capacity.
+ old_capacity = new_space->Capacity();
+ new_space->Shrink();
+ new_capacity = new_space->Capacity();
+ ASSERT_EQ(old_capacity, 2 * new_capacity);
+
+ // Consecutive shrinking should not affect space capacity.
+ old_capacity = new_space->Capacity();
+ new_space->Shrink();
+ new_space->Shrink();
+ new_space->Shrink();
+ new_capacity = new_space->Capacity();
+ ASSERT_EQ(old_capacity, new_capacity);
+}
+
+
class HeapIteratorTestHelper {
public:
HeapIteratorTestHelper(Object* a, Object* b)
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
