Safer interface for heap iteration.

runtime/vm/pages.cc

 // Copyright (c) 2012, 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/pages.h"
 
 #include "platform/assert.h"
 #include "vm/compiler_stats.h"
 #include "vm/gc_marker.h"
 #include "vm/gc_sweeper.h"
@@ skipping 142 matching lines @@
       pages_tail_(NULL),
       exec_pages_(NULL),
       exec_pages_tail_(NULL),
       large_pages_(NULL),
       bump_top_(0),
       bump_end_(0),
       max_capacity_in_words_(max_capacity_in_words),
       max_external_in_words_(max_external_in_words),
       tasks_lock_(new Monitor()),
       tasks_(0),
+#if defined(DEBUG)
+      is_iterating_(false),
+#endif
       page_space_controller_(heap,
                              FLAG_old_gen_growth_space_ratio,
                              FLAG_old_gen_growth_rate,
                              FLAG_old_gen_growth_time_ratio),
       gc_time_micros_(0),
       collections_(0) {
 }
 
 
 PageSpace::~PageSpace() {
@@ skipping 598 matching lines @@
 
   if (FLAG_print_free_list_before_gc) {
     OS::Print("Data Freelist (before GC):\n");
     freelist_[HeapPage::kData].Print();
     OS::Print("Executable Freelist (before GC):\n");
     freelist_[HeapPage::kExecutable].Print();
   }
 
   if (FLAG_verify_before_gc) {
     OS::PrintErr("Verifying before marking...");
-    heap_->Verify();
+    heap_->VerifyGC();
     OS::PrintErr(" done.\n");
   }
 
   const int64_t start = OS::GetCurrentTimeMicros();
 
   // Make code pages writable.
   WriteProtectCode(false);
 
   // Save old value before GCMarker visits the weak persistent handles.
   SpaceUsage usage_before = GetCurrentUsage();
@@ skipping 11 matching lines @@
   // Reset the freelists and setup sweeping.
   freelist_[HeapPage::kData].Reset();
   freelist_[HeapPage::kExecutable].Reset();
 
   int64_t mid2 = OS::GetCurrentTimeMicros();
   int64_t mid3 = 0;
 
   {
     if (FLAG_verify_before_gc) {
       OS::PrintErr("Verifying before sweeping...");
-      heap_->Verify(kAllowMarked);
+      heap_->VerifyGC(kAllowMarked);
       OS::PrintErr(" done.\n");
     }
     GCSweeper sweeper;
 
     // During stop-the-world phases we should use bulk lock when adding elements
     // to the free list.
     MutexLocker mld(freelist_[HeapPage::kData].mutex());
     MutexLocker mle(freelist_[HeapPage::kExecutable].mutex());
 
     // Large and executable pages are always swept immediately.
@@ skipping 40 matching lines @@
         if (page_in_use) {
           prev_page = page;
         } else {
           FreePage(page, prev_page);
         }
         // Advance to the next page.
         page = next_page;
       }
       if (FLAG_verify_after_gc) {
         OS::PrintErr("Verifying after sweeping...");
-        heap_->Verify(kForbidMarked);
+        heap_->VerifyGC(kForbidMarked);
         OS::PrintErr(" done.\n");
       }
     } else {
       // Start the concurrent sweeper task now.
       GCSweeper::SweepConcurrent(
           isolate, pages_, pages_tail_, &freelist_[HeapPage::kData]);
     }
   }
 
   // Make code pages read-only.
@@ skipping 249 matching lines @@
     return 0;
   } else {
     ASSERT(total_time >= gc_time);
     int result = static_cast<int>((static_cast<double>(gc_time) /
                                    static_cast<double>(total_time)) * 100);
     return result;
   }
 }
 
 }  // namespace dart