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

runtime/vm/heap.h

 // 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.
 
 #ifndef VM_HEAP_H_
 #define VM_HEAP_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
@@ skipping 30 matching lines @@
     kNumWeakSelectors
   };
 
   enum ApiCallbacks {
     kIgnoreApiCallbacks,
     kInvokeApiCallbacks
   };
 
   enum GCReason {
     kNewSpace,
-    kPromotionFailure,
+    kPromotion,
     kOldSpace,
     kFull,
     kGCAtAlloc,
     kGCTestCase,
   };
 
   // Default allocation sizes in MB for the old gen and code heaps.
   static const intptr_t kHeapSizeInMWords = 128;
   static const intptr_t kHeapSizeInMB = kHeapSizeInMWords * kWordSize;
   static const intptr_t kCodeHeapSizeInMB = 18;
@@ skipping 37 matching lines @@
                                        growth_policy);
       default:
         UNREACHABLE();
     }
     return 0;
   }
 
   // Track external data.
   void AllocateExternal(intptr_t size, Space space);
   void FreeExternal(intptr_t size, Space space);
+  // Move external size from new to old space. Does not by itself trigger GC.
+  void PromoteExternal(intptr_t size);
 
   // Heap contains the specified address.
   bool Contains(uword addr) const;
   bool NewContains(uword addr) const;
   bool OldContains(uword addr) const;
   bool CodeContains(uword addr) const;
   bool StubCodeContains(uword addr) const;
 
   // Visit all pointers.
   void IteratePointers(ObjectPointerVisitor* visitor);
@@ skipping 16 matching lines @@
   // point.
   // The 'visitor' function should return false if the object is not found,
   // traversal through the heap space continues.
   // Returns null object if nothing is found. Must be called within a NoGCScope.
   RawInstructions* FindObjectInCodeSpace(FindObjectVisitor* visitor) const;
   RawObject* FindOldObject(FindObjectVisitor* visitor) const;
   RawObject* FindNewObject(FindObjectVisitor* visitor) const;
   RawObject* FindObject(FindObjectVisitor* visitor) const;
 
   void CollectGarbage(Space space);
-  void CollectGarbage(Space space, ApiCallbacks api_callbacks);
+  void CollectGarbage(Space space, ApiCallbacks api_callbacks, GCReason reason);
   void CollectAllGarbage();
 
   // Enables growth control on the page space heaps.  This should be
   // called before any user code is executed.
   void EnableGrowthControl() { SetGrowthControlState(true); }
   void DisableGrowthControl() { SetGrowthControlState(false); }
   void SetGrowthControlState(bool state);
   bool GrowthControlState();
 
   // Protect access to the heap.
@@ skipping 179 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_