Rename NoGCScope -> NoSafepointScope.

runtime/vm/heap.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/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
@@ skipping 58 matching lines @@
   for (int sel = 0;
        sel < kNumWeakSelectors;
        sel++) {
     delete new_weak_tables_[sel];
     delete old_weak_tables_[sel];
   }
 }
 
 
 uword Heap::AllocateNew(intptr_t size) {
-  ASSERT(isolate()->no_gc_scope_depth() == 0);
+  ASSERT(isolate()->no_safepoint_scope_depth() == 0);
   uword addr = new_space_->TryAllocate(size);
   if (addr == 0) {
     CollectGarbage(kNew);
     addr = new_space_->TryAllocate(size);
     if (addr == 0) {
       return AllocateOld(size, HeapPage::kData);
     }
   }
   return addr;
 }
 
 
 uword Heap::AllocateOld(intptr_t size, HeapPage::PageType type) {
-  ASSERT(isolate()->no_gc_scope_depth() == 0);
+  ASSERT(isolate()->no_safepoint_scope_depth() == 0);
   uword addr = old_space_->TryAllocate(size, type);
   if (addr != 0) {
     return addr;
   }
   // If we are in the process of running a sweep wait for the sweeper to free
   // memory.
   {
     MonitorLocker ml(old_space_->tasks_lock());
     addr = old_space_->TryAllocate(size, type);
     while ((addr == 0) && (old_space_->tasks() > 0)) {
@@ skipping 40 matching lines @@
     return addr;
   }
   // Give up allocating this object.
   OS::PrintErr(
       "Exhausted heap space, trying to allocate %" Pd " bytes.\n", size);
   return 0;
 }
 
 
 uword Heap::AllocatePretenured(intptr_t size) {
-  ASSERT(isolate()->no_gc_scope_depth() == 0);
+  ASSERT(isolate()->no_safepoint_scope_depth() == 0);
   uword addr = old_space_->TryAllocateDataBump(size, PageSpace::kControlGrowth);
   if (addr != 0) return addr;
   return AllocateOld(size, HeapPage::kData);
 }
 
 
 void Heap::AllocateExternal(intptr_t size, Space space) {
-  ASSERT(isolate()->no_gc_scope_depth() == 0);
+  ASSERT(isolate()->no_safepoint_scope_depth() == 0);
   if (space == kNew) {
     new_space_->AllocateExternal(size);
     if (new_space_->ExternalInWords() > (FLAG_new_gen_ext_limit * MBInWords)) {
       // Attempt to free some external allocation by a scavenge. (If the total
       // remains above the limit, next external alloc will trigger another.)
       CollectGarbage(kNew);
     }
   } else {
     ASSERT(space == kOld);
     old_space_->AllocateExternal(size);
@@ skipping 88 matching lines @@
   return old_space_->FindObject(visitor, HeapPage::kData);
 }
 
 
 RawObject* Heap::FindNewObject(FindObjectVisitor* visitor) const {
   return new_space_->FindObject(visitor);
 }
 
 
 RawObject* Heap::FindObject(FindObjectVisitor* visitor) const {
-  ASSERT(isolate()->no_gc_scope_depth() != 0);
+  ASSERT(isolate()->no_safepoint_scope_depth() != 0);
   RawObject* raw_obj = FindNewObject(visitor);
   if (raw_obj != Object::null()) {
     return raw_obj;
   }
   raw_obj = FindOldObject(visitor);
   if (raw_obj != Object::null()) {
     return raw_obj;
   }
   raw_obj = FindObjectInCodeSpace(visitor);
   return raw_obj;
@@ skipping 427 matching lines @@
     jsobj.AddProperty("eventType", "GC");  // TODO(koda): "GarbageCollected"
     jsobj.AddProperty("isolate", isolate);
     jsobj.AddProperty("reason", Heap::GCReasonToString(stats_.reason_));
     isolate->heap()->PrintToJSONObject(Heap::kNew, &jsobj);
     isolate->heap()->PrintToJSONObject(Heap::kOld, &jsobj);
   }
 }
 
 
 #if defined(DEBUG)
-NoGCScope::NoGCScope() : StackResource(Isolate::Current()) {
-  isolate()->IncrementNoGCScopeDepth();
+NoSafepointScope::NoSafepointScope() : StackResource(Isolate::Current()) {
+  isolate()->IncrementNoSafepointScopeDepth();
 }
 
 
-NoGCScope::~NoGCScope() {
-  isolate()->DecrementNoGCScopeDepth();
+NoSafepointScope::~NoSafepointScope() {
+  isolate()->DecrementNoSafepointScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 
 NoHeapGrowthControlScope::NoHeapGrowthControlScope()
     : StackResource(Isolate::Current()) {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     current_growth_controller_state_ = heap->GrowthControlState();
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart