Revision: 9398
Author: [email protected]
Date: Thu Sep 22 07:50:20 2011
Log: Cleanup and enable GrowAndShrinkNewSpace test case.
[email protected]
BUG=v8:1707
TEST=cctest/test-heap/GrowAndShrinkNewSpace
Review URL: http://codereview.chromium.org/7995004
http://code.google.com/p/v8/source/detail?r=9398
Modified:
/branches/bleeding_edge/test/cctest/cctest.status
/branches/bleeding_edge/test/cctest/test-heap.cc
=======================================
--- /branches/bleeding_edge/test/cctest/cctest.status Thu Sep 22 06:19:19
2011
+++ /branches/bleeding_edge/test/cctest/cctest.status Thu Sep 22 07:50:20
2011
@@ -52,9 +52,6 @@
# 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
=======================================
--- /branches/bleeding_edge/test/cctest/test-heap.cc Thu Sep 22 04:30:04
2011
+++ /branches/bleeding_edge/test/cctest/test-heap.cc Thu Sep 22 07:50:20
2011
@@ -1224,36 +1224,45 @@
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);
-
- // 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)));
- }
+ CHECK_EQ(2 * old_capacity, new_capacity);
+
+ // 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);
-
- // Perform scavenge to empty the new space.
+ CHECK_EQ(old_capacity, new_capacity);
+
+ // 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 @@
new_space->Shrink();
new_space->Shrink();
new_capacity = new_space->Capacity();
- ASSERT_EQ(old_capacity, new_capacity);
-}
+ CHECK_EQ(old_capacity, new_capacity);
+}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
