Multi-page growing and shrinking new-space

src/incremental-marking.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 69 matching lines @@
   INLINE(void MarkObjectByPointer(Object** p)) {
     Object* obj = *p;
     // Since we can be sure that the object is not tagged as a failure we can
     // inline a slightly more efficient tag check here than IsHeapObject() would
     // produce.
     if (obj->NonFailureIsHeapObject()) {
       HeapObject* heap_object = HeapObject::cast(obj);
       MarkBit mark_bit = Marking::MarkBitFrom(heap_object);
       if (mark_bit.data_only()) {
         incremental_marking_->MarkBlackOrKeepGrey(mark_bit);
-      } else {
-        if (Marking::IsWhite(mark_bit)) {
-          incremental_marking_->WhiteToGreyAndPush(heap_object, mark_bit);
-        }
+      } else if (Marking::IsWhite(mark_bit)) {
+        incremental_marking_->WhiteToGreyAndPush(heap_object, mark_bit);
       }
     }
   }
 
   Heap* heap_;
   IncrementalMarking* incremental_marking_;
 };
 
 
 class IncrementalMarkingRootMarkingVisitor : public ObjectVisitor {
@@ skipping 42 matching lines @@
              chunk->scan_on_scavenge()) {
     chunk->ClearFlag(MemoryChunk::POINTERS_TO_HERE_ARE_INTERESTING);
     chunk->ClearFlag(MemoryChunk::POINTERS_FROM_HERE_ARE_INTERESTING);
   } else {
     chunk->ClearFlag(MemoryChunk::POINTERS_TO_HERE_ARE_INTERESTING);
     chunk->SetFlag(MemoryChunk::POINTERS_FROM_HERE_ARE_INTERESTING);
   }
 }
 
 
-void IncrementalMarking::SetNewSpacePageFlags(MemoryChunk* chunk,
+void IncrementalMarking::SetNewSpacePageFlags(NewSpacePage* chunk,
                                               bool is_marking) {
   chunk->SetFlag(MemoryChunk::POINTERS_TO_HERE_ARE_INTERESTING);
   if (is_marking) {
     chunk->SetFlag(MemoryChunk::POINTERS_FROM_HERE_ARE_INTERESTING);
   } else {
     chunk->ClearFlag(MemoryChunk::POINTERS_FROM_HERE_ARE_INTERESTING);
   }
+  chunk->SetFlag(MemoryChunk::SCAN_ON_SCAVENGE);
 }
 
 
-void IncrementalMarking::DeactivateWriteBarrierForSpace(PagedSpace* space) {
+void IncrementalMarking::DeactivateIncrementalWriteBarrierForSpace(
+    PagedSpace* space) {
   PageIterator it(space);
   while (it.has_next()) {
     Page* p = it.next();
     SetOldSpacePageFlags(p, false);
   }
 }
 
 
-void IncrementalMarking::DeactivateWriteBarrier() {
-  DeactivateWriteBarrierForSpace(heap_->old_pointer_space());
-  DeactivateWriteBarrierForSpace(heap_->old_data_space());
-  DeactivateWriteBarrierForSpace(heap_->cell_space());
-  DeactivateWriteBarrierForSpace(heap_->map_space());
-  DeactivateWriteBarrierForSpace(heap_->code_space());
+void IncrementalMarking::DeactivateIncrementalWriteBarrierForSpace(
+    NewSpace* space) {
+  NewSpacePageIterator it(space);
+  while (it.has_next()) {
+    NewSpacePage* p = it.next();
+    SetNewSpacePageFlags(p, false);
+  }
+}
 
-  SetNewSpacePageFlags(heap_->new_space()->ActivePage(), false);
+
+void IncrementalMarking::DeactivateIncrementalWriteBarrier() {
+  DeactivateIncrementalWriteBarrierForSpace(heap_->old_pointer_space());
+  DeactivateIncrementalWriteBarrierForSpace(heap_->old_data_space());
+  DeactivateIncrementalWriteBarrierForSpace(heap_->cell_space());
+  DeactivateIncrementalWriteBarrierForSpace(heap_->map_space());
+  DeactivateIncrementalWriteBarrierForSpace(heap_->code_space());
+  DeactivateIncrementalWriteBarrierForSpace(heap_->new_space());
 
   LargePage* lop = heap_->lo_space()->first_page();
   while (lop->is_valid()) {
     SetOldSpacePageFlags(lop, false);
     lop = lop->next_page();
   }
 }
 
 
 void IncrementalMarking::ClearMarkbits(PagedSpace* space) {
   PageIterator it(space);
   while (it.has_next()) {
     Page* p = it.next();
     p->markbits()->Clear();
     SetOldSpacePageFlags(p, true);
   }
 }
 
 
+void IncrementalMarking::ClearMarkbits(NewSpace* space) {
+  NewSpacePageIterator it(space->ToSpaceLow(), space->ToSpaceHigh());
+  while (it.has_next()) {
+    NewSpacePage* p = it.next();
+    p->markbits()->Clear();
+    SetNewSpacePageFlags(p, true);
+  }
+}
+
+
 void IncrementalMarking::ClearMarkbits() {
   // TODO(gc): Clear the mark bits in the sweeper.
   ClearMarkbits(heap_->old_pointer_space());
   ClearMarkbits(heap_->old_data_space());
   ClearMarkbits(heap_->cell_space());
   ClearMarkbits(heap_->map_space());
   ClearMarkbits(heap_->code_space());
-  heap_->new_space()->ActivePage()->markbits()->Clear();
-
-  SetNewSpacePageFlags(heap_->new_space()->ActivePage(), true);
+  ClearMarkbits(heap_->new_space());
 
   LargePage* lop = heap_->lo_space()->first_page();
   while (lop->is_valid()) {
     SetOldSpacePageFlags(lop, true);
     lop = lop->next_page();
   }
 }
 
 
 #ifdef DEBUG
 void IncrementalMarking::VerifyMarkbitsAreClean(PagedSpace* space) {
   PageIterator it(space);
 
   while (it.has_next()) {
     Page* p = it.next();
     ASSERT(p->markbits()->IsClean());
   }
 }
 
 
+void IncrementalMarking::VerifyMarkbitsAreClean(NewSpace* space) {
+  NewSpacePageIterator it(space->ToSpaceLow(), space->ToSpaceHigh());
+
+  while (it.has_next()) {
+    NewSpacePage* p = it.next();
+    ASSERT(p->markbits()->IsClean());
+  }
+}
+
+
 void IncrementalMarking::VerifyMarkbitsAreClean() {
   VerifyMarkbitsAreClean(heap_->old_pointer_space());
   VerifyMarkbitsAreClean(heap_->old_data_space());
   VerifyMarkbitsAreClean(heap_->code_space());
   VerifyMarkbitsAreClean(heap_->cell_space());
   VerifyMarkbitsAreClean(heap_->map_space());
-  ASSERT(heap_->new_space()->ActivePage()->markbits()->IsClean());
+  VerifyMarkbitsAreClean(heap_->new_space());
 }
 #endif
 
 
 bool IncrementalMarking::WorthActivating() {
 #ifndef DEBUG
   static const intptr_t kActivationThreshold = 8 * MB;
 #else
   // TODO(gc) consider setting this to some low level so that some
   // debug tests run with incremental marking and some without.
@@ skipping 91 matching lines @@
 
   // Ready to start incremental marking.
   if (FLAG_trace_incremental_marking) {
     PrintF("[IncrementalMarking] Running\n");
   }
 }
 
 
 void IncrementalMarking::PrepareForScavenge() {
   if (!IsMarking()) return;
-  heap_->new_space()->InactivePage()->markbits()->Clear();
+  NewSpacePageIterator it(heap_->new_space()->FromSpaceLow(),
+                          heap_->new_space()->FromSpaceHigh());
+  while (it.has_next()) {
+    it.next()->markbits()->Clear();
+  }
 }
 
 
 void IncrementalMarking::UpdateMarkingDequeAfterScavenge() {
   if (!IsMarking()) return;
 
   intptr_t current = marking_deque_.bottom();
   intptr_t mask = marking_deque_.mask();
   intptr_t limit = marking_deque_.top();
   HeapObject** array = marking_deque_.array();
@@ skipping 61 matching lines @@
 void IncrementalMarking::Abort() {
   if (IsStopped()) return;
   if (FLAG_trace_incremental_marking) {
     PrintF("[IncrementalMarking] Aborting.\n");
   }
   heap_->new_space()->LowerInlineAllocationLimit(0);
   IncrementalMarking::set_should_hurry(false);
   ResetStepCounters();
   if (IsMarking()) {
     PatchIncrementalMarkingRecordWriteStubs(false);
-    DeactivateWriteBarrier();
+    DeactivateIncrementalWriteBarrier();
   }
   heap_->isolate()->stack_guard()->Continue(GC_REQUEST);
   state_ = STOPPED;
 }
 
 
 void IncrementalMarking::Finalize() {
   Hurry();
   state_ = STOPPED;
   heap_->new_space()->LowerInlineAllocationLimit(0);
   IncrementalMarking::set_should_hurry(false);
   ResetStepCounters();
   PatchIncrementalMarkingRecordWriteStubs(false);
-  DeactivateWriteBarrier();
+  DeactivateIncrementalWriteBarrier();
   ASSERT(marking_deque_.IsEmpty());
   heap_->isolate()->stack_guard()->Continue(GC_REQUEST);
 }
 
 
 void IncrementalMarking::MarkingComplete() {
   state_ = COMPLETE;
   // We will set the stack guard to request a GC now.  This will mean the rest
   // of the GC gets performed as soon as possible (we can't do a GC here in a
   // record-write context).  If a few things get allocated between now and then
@@ skipping 69 matching lines @@
   }
 
   if (FLAG_trace_incremental_marking || FLAG_trace_gc) {
     double end = OS::TimeCurrentMillis();
     steps_took_ += (end - start);
   }
 }
 
 
 } }  // namespace v8::internal