1. Add code to grow the heap instead of collecting garbage in Heap::AllocateOld when allocation is …

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 107 matching lines @@
   // traversal through the heap space continues.
   // Returns null object if nothing is found.
   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, GCReason reason);
   void CollectAllGarbage();
+  bool NeedsGarbageCollection() const {
+    return old_space_.NeedsGarbageCollection();
+  }
 
   // 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. Note: Code pages are made
   // executable/non-executable when 'read_only' is true/false, respectively.
@@ skipping 86 matching lines @@
   void RecordTime(int id, int64_t micros) {
     ASSERT((id >= 0) && (id < GCStats::kDataEntries));
     stats_.times_[id] = micros;
   }
 
   void RecordData(int id, intptr_t value) {
     ASSERT((id >= 0) && (id < GCStats::kDataEntries));
     stats_.data_[id] = value;
   }
 
-  bool gc_in_progress();
-
   void UpdateGlobalMaxUsed();
 
   static bool IsAllocatableInNewSpace(intptr_t size) {
     return size <= kNewAllocatableSize;
   }
 
   void PrintToJSONObject(Space space, JSONObject* object) const;
 
   // The heap map contains the sizes and class ids for the objects in each page.
   void PrintHeapMapToJSONStream(Isolate* isolate, JSONStream* stream) {
@@ skipping 55 matching lines @@
   void VisitObjectPointers(ObjectPointerVisitor* visitor) const;
 
   // Visit all objects, including FreeListElement "objects". Caller must ensure
   // concurrent sweeper is not running, and the visitor must not allocate.
   void VisitObjects(ObjectVisitor* visitor) const;
 
   // Like Verify, but does not wait for concurrent sweeper, so caller must
   // ensure thread-safety.
   bool VerifyGC(MarkExpectation mark_expectation = kForbidMarked) const;
 
+  // Helper functions for garbage collection.
+  void CollectNewSpaceGarbage(
+      Thread* thread, ApiCallbacks api_callbacks, GCReason reason);
+  void CollectOldSpaceGarbage(
+      Thread* thread, ApiCallbacks api_callbacks, GCReason reason);
+
   // GC stats collection.
   void RecordBeforeGC(Space space, GCReason reason);
-  void RecordAfterGC();
+  void RecordAfterGC(Space space);
   void PrintStats();
   void UpdateClassHeapStatsBeforeGC(Heap::Space space);
   void UpdatePretenurePolicy();
 
-  // Updates gc_in_progress.
-  void BeginGC();
-  void EndGC();
+  // Updates gc in progress flags.
+  bool BeginNewSpaceGC();
+  void EndNewSpaceGC();
+  bool BeginOldSpaceGC();
+  void EndOldSpaceGC();
 
   // If this heap is non-empty, updates start and end to the smallest range that
   // contains both the original [start, end) and the [lowest, highest) addresses
   // of this heap.
   void GetMergedAddressRange(uword* start, uword* end) const;
 
   Isolate* isolate_;
 
   // The different spaces used for allocation.
   Scavenger new_space_;
   PageSpace old_space_;
 
   WeakTable* new_weak_tables_[kNumWeakSelectors];
   WeakTable* old_weak_tables_[kNumWeakSelectors];
 
   // GC stats collection.
   GCStats stats_;
 
   // This heap is in read-only mode: No allocation is allowed.
   bool read_only_;
 
   // GC on the heap is in progress.
-  Mutex gc_in_progress_mutex_;
-  bool gc_in_progress_;
+  Monitor gc_in_progress_monitor_;
+  bool gc_new_space_in_progress_;
+  bool gc_old_space_in_progress_;
 
   int pretenure_policy_;
 
   friend class ServiceEvent;
   friend class PageSpace;  // VerifyGC
   DISALLOW_COPY_AND_ASSIGN(Heap);
 };
 
 
 class HeapIterationScope : public StackResource {
@@ skipping 24 matching lines @@
   explicit WritableVMIsolateScope(Thread* thread, bool include_code_pages);
   ~WritableVMIsolateScope();
 
  private:
   bool include_code_pages_;
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_