Simpler, more consistent triggering of old GC; also, use external in policy.

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 86 matching lines @@
   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);
+    if (old_space_->NeedsGarbageCollection()) {
+      CollectGarbage(kOld);
+    }
   }
 }
 
 void Heap::FreeExternal(intptr_t size, Space space) {
   if (space == kNew) {
     new_space_->FreeExternal(size);
   } else {
     ASSERT(space == kOld);
     old_space_->FreeExternal(size);
   }
 }
 
+void Heap::PromoteExternal(intptr_t size) {
+  new_space_->FreeExternal(size);
+  old_space_->AllocateExternal(size);
+}
+
 bool Heap::Contains(uword addr) const {
   return new_space_->Contains(addr) ||
       old_space_->Contains(addr);
 }
 
 
 bool Heap::NewContains(uword addr) const {
   return new_space_->Contains(addr);
 }
 
@@ skipping 67 matching lines @@
   }
   raw_obj = FindOldObject(visitor);
   if (raw_obj != Object::null()) {
     return raw_obj;
   }
   raw_obj = FindObjectInCodeSpace(visitor);
   return raw_obj;
 }
 
 
-void Heap::CollectGarbage(Space space, ApiCallbacks api_callbacks) {
+void Heap::CollectGarbage(Space space,
+                          ApiCallbacks api_callbacks,
+                          GCReason reason) {
   Isolate* isolate = Isolate::Current();
   TIMERSCOPE(isolate, time_gc);
   bool invoke_api_callbacks = (api_callbacks == kInvokeApiCallbacks);
   switch (space) {
     case kNew: {
       VMTagScope tagScope(isolate, VMTag::kGCNewSpaceTagId);
-      RecordBeforeGC(kNew, kNewSpace);
+      RecordBeforeGC(kNew, reason);
       UpdateClassHeapStatsBeforeGC(kNew);
       new_space_->Scavenge(invoke_api_callbacks);
       RecordAfterGC();
       PrintStats();
-      // TODO(koda): Replace promotion failure tracking with
-      // old_space_->NeedsGarbageCollection.
-      if (new_space_->HadPromotionFailure() || old_space_->NeedExternalGC()) {
+      if (old_space_->NeedsGarbageCollection()) {
         // Old collections should call the API callbacks.
-        CollectGarbage(kOld, kInvokeApiCallbacks);
+        CollectGarbage(kOld, kInvokeApiCallbacks, kPromotion);
       }
       break;
     }
     case kOld:
     case kCode: {
       VMTagScope tagScope(isolate, VMTag::kGCOldSpaceTagId);
-      bool promotion_failure = new_space_->HadPromotionFailure();
-      RecordBeforeGC(kOld, promotion_failure ? kPromotionFailure : kOldSpace);
+      RecordBeforeGC(kOld, reason);
       UpdateClassHeapStatsBeforeGC(kOld);
       old_space_->MarkSweep(invoke_api_callbacks);
       RecordAfterGC();
       PrintStats();
       break;
     }
     default:
       UNREACHABLE();
   }
 }
 
 
 void Heap::UpdateClassHeapStatsBeforeGC(Heap::Space space) {
   Isolate* isolate = Isolate::Current();
   ClassTable* class_table = isolate->class_table();
   if (space == kNew) {
     class_table->ResetCountersNew();
   } else {
     class_table->ResetCountersOld();
   }
 }
 
 
 void Heap::CollectGarbage(Space space) {
-  ApiCallbacks api_callbacks;
   if (space == kOld) {
-    api_callbacks = kInvokeApiCallbacks;
+    CollectGarbage(space, kInvokeApiCallbacks, kOldSpace);
   } else {
-    api_callbacks = kIgnoreApiCallbacks;
+    ASSERT(space == kNew);
+    CollectGarbage(space, kIgnoreApiCallbacks, kNewSpace);
   }
-  CollectGarbage(space, api_callbacks);
 }
 
 
 void Heap::CollectAllGarbage() {
   Isolate* isolate = Isolate::Current();
   TIMERSCOPE(isolate, time_gc);
   {
     VMTagScope tagScope(isolate, VMTag::kGCNewSpaceTagId);
     RecordBeforeGC(kNew, kFull);
     UpdateClassHeapStatsBeforeGC(kNew);
@@ skipping 129 matching lines @@
     return new_space_->collections();
   }
   return old_space_->collections();
 }
 
 
 const char* Heap::GCReasonToString(GCReason gc_reason) {
   switch (gc_reason) {
     case kNewSpace:
       return "new space";
-    case kPromotionFailure:
-      return "promotion failure";
+    case kPromotion:
+      return "promotion";
     case kOldSpace:
       return "old space";
     case kFull:
       return "full";
     case kGCAtAlloc:
       return "debugging";
     case kGCTestCase:
       return "test case";
     default:
       UNREACHABLE();
@@ skipping 152 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart