Safer interface for heap iteration.

runtime/vm/object_graph.cc

 // Copyright (c) 2014, 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/object_graph.h"
 
 #include "vm/dart.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 130 matching lines @@
   explicit Unmarker(Isolate* isolate) : ObjectVisitor(isolate) { }
 
   void VisitObject(RawObject* obj) {
     if (obj->IsMarked()) {
       obj->ClearMarkBit();
     }
   }
 
   static void UnmarkAll(Isolate* isolate) {
     Unmarker unmarker(isolate);
-    isolate->heap()->VisitObjects(&unmarker);
+    isolate->heap()->IterateObjects(&unmarker);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Unmarker);
 };
 
 
 ObjectGraph::ObjectGraph(Isolate* isolate)
     : StackResource(isolate) {
   // The VM isolate has all its objects pre-marked, so iterating over it
   // would be a no-op.
   ASSERT(isolate != Dart::vm_isolate());
   isolate->heap()->WriteProtectCode(false);
 }
 
 
 ObjectGraph::~ObjectGraph() {
   isolate()->heap()->WriteProtectCode(true);
 }
 
 
 void ObjectGraph::IterateObjects(ObjectGraph::Visitor* visitor) {
   NoSafepointScope no_safepoint_scope_;
-  PageSpace* old_space = isolate()->heap()->old_space();
-  MonitorLocker ml(old_space->tasks_lock());
-  while (old_space->tasks() > 0) {
-    ml.Wait();
-  }
   Stack stack(isolate());
-  isolate()->VisitObjectPointers(&stack, false, false);
+  isolate()->IterateObjectPointers(&stack, false, false);
   stack.TraverseGraph(visitor);
   Unmarker::UnmarkAll(isolate());
 }
 
 
 void ObjectGraph::IterateObjectsFrom(const Object& root,
                                      ObjectGraph::Visitor* visitor) {
   NoSafepointScope no_safepoint_scope_;
-  PageSpace* old_space = isolate()->heap()->old_space();
-  MonitorLocker ml(old_space->tasks_lock());
-  while (old_space->tasks() > 0) {
-    ml.Wait();
-  }
   Stack stack(isolate());
   RawObject* root_raw = root.raw();
   stack.VisitPointer(&root_raw);
   stack.TraverseGraph(visitor);
   // TODO(koda): Optimize if we only visited a small subgraph.
   Unmarker::UnmarkAll(isolate());
 }
 
 
 class SizeVisitor : public ObjectGraph::Visitor {
@@ skipping 165 matching lines @@
   const Array& references_;
   Object* scratch_;
   intptr_t length_;
 };
 
 
 intptr_t ObjectGraph::InboundReferences(Object* obj, const Array& references) {
   Object& scratch = Object::Handle();
   NoSafepointScope no_safepoint_scope_;
   InboundReferencesVisitor visitor(isolate(), obj->raw(), references, &scratch);
-  isolate()->heap()->VisitObjects(&visitor);
+  isolate()->heap()->IterateObjects(&visitor);
   return visitor.length();
 }
 
 
 static void WritePtr(RawObject* raw, WriteStream* stream) {
   ASSERT(raw->IsHeapObject());
   ASSERT(raw->IsOldObject());
   uword addr = RawObject::ToAddr(raw);
   ASSERT(Utils::IsAligned(addr, kObjectAlignment));
   // Using units of kObjectAlignment makes the ids fit into Smis when parsed
@@ skipping 68 matching lines @@
 intptr_t ObjectGraph::Serialize(WriteStream* stream) {
   // Current encoding assumes objects do not move, so promote everything to old.
   isolate()->heap()->new_space()->Evacuate();
   WriteGraphVisitor visitor(isolate(), stream);
   stream->WriteUnsigned(kObjectAlignment);
   stream->WriteUnsigned(0);
   stream->WriteUnsigned(0);
   stream->WriteUnsigned(0);
   {
     WritePointerVisitor ptr_writer(isolate(), stream);
-    isolate()->VisitObjectPointers(&ptr_writer, false, false);
+    isolate()->IterateObjectPointers(&ptr_writer, false, false);
   }
   stream->WriteUnsigned(0);
   IterateObjects(&visitor);
   return visitor.count() + 1;  // + root
 }
 
 }  // namespace dart