- Start using the collected store buffer entries to find

vm/gc_marker.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/gc_marker.h"
 
 #include "vm/allocation.h"
 #include "vm/dart_api_state.h"
 #include "vm/isolate.h"
 #include "vm/pages.h"
@@ skipping 106 matching lines @@
 class MarkingVisitor : public ObjectPointerVisitor {
  public:
   MarkingVisitor(Isolate* isolate,
                  Heap* heap,
                  PageSpace* page_space,
                  MarkingStack* marking_stack)
       : ObjectPointerVisitor(isolate),
         heap_(heap),
         vm_heap_(Dart::vm_isolate()->heap()),
         page_space_(page_space),
-        marking_stack_(marking_stack) {
+        marking_stack_(marking_stack),
+        update_store_buffers_(false) {
     ASSERT(heap_ != vm_heap_);
   }
 
   MarkingStack* marking_stack() const { return marking_stack_; }
 
   void VisitPointers(RawObject** first, RawObject** last) {
     for (RawObject** current = first; current <= last; current++) {
-      MarkObject(*current);
+      MarkObject(*current, current);
     }
   }
 
+  void set_update_store_buffers(bool val) { update_store_buffers_ = val; }
+
  private:
   void MarkAndPush(RawObject* raw_obj) {
     ASSERT(raw_obj->IsHeapObject());
     ASSERT(page_space_->Contains(RawObject::ToAddr(raw_obj)));
 
     // Mark the object and push it on the marking stack.
     ASSERT(!raw_obj->IsMarked());
     RawClass* raw_class = isolate()->class_table()->At(raw_obj->GetClassId());
     raw_obj->SetMarkBit();
     marking_stack_->Push(raw_obj);
 
     // Update the number of used bytes on this page for fast accounting.
     HeapPage* page = PageSpace::PageFor(raw_obj);
     page->AddUsed(raw_obj->Size());
 
     // TODO(iposva): Should we mark the classes early?
-    MarkObject(raw_class);
+    MarkObject(raw_class, NULL);
   }
 
-  void MarkObject(RawObject* raw_obj) {
+  void MarkObject(RawObject* raw_obj, RawObject** p) {
     // Fast exit if the raw object is a Smi.
     if (!raw_obj->IsHeapObject()) return;
 
     // Fast exit if the raw object is marked.
     if (raw_obj->IsMarked()) return;
 
     // Skip over new objects, but verify consistency of heap while at it.
     if (raw_obj->IsNewObject()) {
       // TODO(iposva): Add consistency check.
+      if (update_store_buffers_) {
+        ASSERT(p != NULL);
+        isolate()->store_buffer()->AddPointer(reinterpret_cast<uword>(p));
+      }
       return;
     }
 
     // TODO(iposva): merge old and code spaces.
     ASSERT(page_space_->Contains(RawObject::ToAddr(raw_obj)));
     MarkAndPush(raw_obj);
   }
 
   Heap* heap_;
   Heap* vm_heap_;
   PageSpace* page_space_;
   MarkingStack* marking_stack_;
+  bool update_store_buffers_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MarkingVisitor);
 };
 
 
 bool IsUnreachable(const RawObject* raw_obj) {
   if (!raw_obj->IsHeapObject()) {
     return false;
   }
   if (raw_obj == Object::null()) {
@@ skipping 22 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MarkingWeakVisitor);
 };
 
 
 void GCMarker::Prologue(Isolate* isolate, bool invoke_api_callbacks) {
   if (invoke_api_callbacks) {
     isolate->gc_prologue_callbacks().Invoke();
   }
+  // The store buffers will be rebuilt as part of marking, reset them now.
+  isolate->store_buffer()->Reset();
+  isolate->store_buffer_block()->Reset();
 }
 
 
 void GCMarker::Epilogue(Isolate* isolate, bool invoke_api_callbacks) {
   if (invoke_api_callbacks) {
     isolate->gc_epilogue_callbacks().Invoke();
   }
 }
 
 
@@ skipping 65 matching lines @@
     state->set_delayed_weak_references(NULL);
     while (queue != NULL) {
       delete WeakReference::Pop(&queue);
     }
   }
 }
 
 
 void GCMarker::DrainMarkingStack(Isolate* isolate,
                                  MarkingVisitor* visitor) {
+  visitor->set_update_store_buffers(true);
   while (!visitor->marking_stack()->IsEmpty()) {
     RawObject* raw_obj = visitor->marking_stack()->Pop();
     raw_obj->VisitPointers(visitor);
   }
+  visitor->set_update_store_buffers(false);
 }
 
 
 void GCMarker::MarkObjects(Isolate* isolate,
                            PageSpace* page_space,
                            bool invoke_api_callbacks) {
   MarkingStack marking_stack;
   Prologue(isolate, invoke_api_callbacks);
   MarkingVisitor mark(isolate, heap_, page_space, &marking_stack);
   IterateRoots(isolate, &mark, !invoke_api_callbacks);
   DrainMarkingStack(isolate, &mark);
   IterateWeakReferences(isolate, &mark);
   MarkingWeakVisitor mark_weak;
   IterateWeakRoots(isolate, &mark_weak, invoke_api_callbacks);
   Epilogue(isolate, invoke_api_callbacks);
 }
 
 }  // namespace dart