Do inline object filtering (via page flags) before call to RecordWriteStub.

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 117 matching lines @@
         incremental_marking_->WhiteToGreyAndPush(heap_object, mark_bit);
       }
     }
   }
 
   Heap* heap_;
   IncrementalMarking* incremental_marking_;
 };
 
 
+void IncrementalMarking::SetOldSpacePageFlags(MemoryChunk* chunk,
+                                              bool is_marking) {
+  if (is_marking) {
+    chunk->SetFlag(MemoryChunk::CONTAINS_INTERESTING_VALUES);
+    chunk->SetFlag(MemoryChunk::CONTAINS_INTERESTING_DESTINATIONS);
+  } else if (chunk->owner()->identity() == CELL_SPACE ||
+             chunk->scan_on_scavenge()) {
+    chunk->ClearFlag(MemoryChunk::CONTAINS_INTERESTING_VALUES);
+    chunk->ClearFlag(MemoryChunk::CONTAINS_INTERESTING_DESTINATIONS);
+  } else {
+    chunk->ClearFlag(MemoryChunk::CONTAINS_INTERESTING_VALUES);
+    chunk->SetFlag(MemoryChunk::CONTAINS_INTERESTING_DESTINATIONS);
+  }
+}
+
+
+void IncrementalMarking::SetNewSpacePageFlags(MemoryChunk* chunk,
+                                              bool is_marking) {
+  chunk->SetFlag(MemoryChunk::CONTAINS_INTERESTING_VALUES);
+  if (is_marking) {
+    chunk->SetFlag(MemoryChunk::CONTAINS_INTERESTING_DESTINATIONS);
+  } else {
+    chunk->ClearFlag(MemoryChunk::CONTAINS_INTERESTING_DESTINATIONS);
+  }
+}
+
+
+void IncrementalMarking::RevertWriteBarrierFlags(PagedSpace* space) {

[Erik Corry, 2011/05/11 18:53:57]

Revert doesn't convey a lot of meaning to me.  Reverting from what to what?  How
about "DeactivateIncrementalWriteBarrier"?

[Vyacheslav Egorov (Chromium), 2011/05/13 11:06:52]

Done.

+  PageIterator it(space);
+  while (it.has_next()) {
+    Page* p = it.next();
+    SetOldSpacePageFlags(p, false);
+  }
+}
+
+
+void IncrementalMarking::RevertWriteBarrierFlags() {
+  RevertWriteBarrierFlags(heap_->old_pointer_space());
+  RevertWriteBarrierFlags(heap_->old_data_space());
+  RevertWriteBarrierFlags(heap_->cell_space());
+  RevertWriteBarrierFlags(heap_->map_space());
+  RevertWriteBarrierFlags(heap_->code_space());
+
+  SetNewSpacePageFlags(heap_->new_space()->ActivePage(), false);
+
+  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() {
   // 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());
+
+  SetNewSpacePageFlags(heap_->new_space()->ActivePage(), true);
+
+  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());
@@ skipping 196 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);
+  if (IsMarking()) {
+    PatchIncrementalMarkingRecordWriteStubs(false);
+    RevertWriteBarrierFlags();
+  }
   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);
+  RevertWriteBarrierFlags();
   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 67 matching lines @@
   }
 
   if (FLAG_trace_incremental_marking || FLAG_trace_gc) {
     double end = OS::TimeCurrentMillis();
     steps_took_ += (end - start);
   }
 }
 
 
 } }  // namespace v8::internal