Cleanup and enable GrowAndShrinkNewSpace test case.

R=svenpanne@chromium.org
BUG=v8:1707
TEST=cctest/test-heap/GrowAndShrinkNewSpace

Review URL: http://codereview.chromium.org/7995004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9398 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent c23f9867
......@@ -52,9 +52,6 @@ test-profile-generator/RecordStackTraceAtStartProfiling: PASS || FAIL
# We do not yet shrink weak maps after they have been emptied by the GC
test-weakmaps/Shrinking: FAIL
# NewGC: http://code.google.com/p/v8/issues/detail?id=1707
test-heap/GrowAndShrinkNewSpace: PASS || TIMEOUT
# NewGC: BUG(1717)
test-api/OutOfMemoryNested: PASS || TIMEOUT
......
......@@ -1224,36 +1224,45 @@ 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;
intptr_t old_capacity, new_capacity;
old_capacity = new_space->Capacity();
new_space->Grow();
new_capacity = new_space->Capacity();
ASSERT_EQ(2 * old_capacity, new_capacity);
CHECK_EQ(2 * old_capacity, new_capacity);
// Fill up new space to the point that it is almost full.
while (new_space->SizeAsInt() + FixedArray::SizeFor(1000) < new_capacity) {
ASSERT(HEAP->InNewSpace(*FACTORY->NewFixedArray(1000, NOT_TENURED)));
// Fill up new space to the point that it is completely full. Make sure
// that the scavenger does not undo the filling.
old_capacity = new_space->Capacity();
{
v8::HandleScope scope;
AlwaysAllocateScope always_allocate;
intptr_t available = new_space->EffectiveCapacity() - new_space->Size();
intptr_t number_of_fillers = (available / FixedArray::SizeFor(1000)) - 10;
for (intptr_t i = 0; i < number_of_fillers; i++) {
CHECK(HEAP->InNewSpace(*FACTORY->NewFixedArray(1000, NOT_TENURED)));
}
}
new_capacity = new_space->Capacity();
CHECK_EQ(old_capacity, new_capacity);
// 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);
CHECK_EQ(old_capacity, new_capacity);
// Perform scavenge to empty the new space.
// Let the scavenger empty the new space.
HEAP->CollectGarbage(NEW_SPACE);
ASSERT_LE(new_space->SizeAsInt(), old_capacity);
CHECK_LE(new_space->Size(), 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);
CHECK_EQ(old_capacity, 2 * new_capacity);
// Consecutive shrinking should not affect space capacity.
old_capacity = new_space->Capacity();
......@@ -1261,5 +1270,5 @@ TEST(GrowAndShrinkNewSpace) {
new_space->Shrink();
new_space->Shrink();
new_capacity = new_space->Capacity();
ASSERT_EQ(old_capacity, new_capacity);
CHECK_EQ(old_capacity, new_capacity);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment