Remove default heap size limit and add separate limit for externals.

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 40 matching lines @@
 
   enum GCReason {
     kNewSpace,
     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;
+  // Default allocation sizes in MB for the code heap.
   static const intptr_t kCodeHeapSizeInMB = 18;

[Ivan Posva, 2015/01/22 01:45:15]

Where is kCodeHeapSizeInMB being used?

[koda, 2015/01/22 03:26:08]

Nowhere! Remove.

 
 #if defined(DEBUG)
   // Pattern for unused new space and swept old space.
   static const uint64_t kZap64Bits = 0xf3f3f3f3f3f3f3f3;
   static const uint32_t kZap32Bits = static_cast<uint32_t>(kZap64Bits);
   static const uint8_t kZapByte = static_cast<uint8_t>(kZap64Bits);
 #endif  // DEBUG
 
   ~Heap();
 
@@ skipping 79 matching lines @@
   }
 
   // Accessors for inlined allocation in generated code.
   uword TopAddress(Space space);
   uword EndAddress(Space space);
   Space SpaceForAllocation(intptr_t class_id) const;
 
   // Initialize the heap and register it with the isolate.
   static void Init(Isolate* isolate,
                    intptr_t max_new_gen_words,
-                   intptr_t max_old_gen_words);
+                   intptr_t max_old_gen_words,
+                   intptr_t max_external_words);
 
   // Verify that all pointers in the heap point to the heap.
   bool Verify(MarkExpectation mark_expectation = kForbidMarked) const;
 
   // Print heap sizes.
   void PrintSizes() const;
 
   // Return amount of memory used and capacity in a space, excluding external.
   intptr_t UsedInWords(Space space) const;
   intptr_t CapacityInWords(Space space) const;
@@ skipping 102 matching lines @@
     intptr_t data_[kDataEntries];
 
    private:
     DISALLOW_COPY_AND_ASSIGN(GCStats);
   };
 
   static const intptr_t kNewAllocatableSize = 256 * KB;
 
   Heap(Isolate* isolate,
        intptr_t max_new_gen_semi_words,  // Max capacity of new semi-space.
-       intptr_t max_old_gen_words);
+       intptr_t max_old_gen_words,
+       intptr_t max_external_words);
 
   uword AllocateNew(intptr_t size);
   uword AllocateOld(intptr_t size, HeapPage::PageType type);
   uword AllocatePretenured(intptr_t size);
 
   // GC stats collection.
   void RecordBeforeGC(Space space, GCReason reason);
   void RecordAfterGC();
   void PrintStats();
   void UpdateClassHeapStatsBeforeGC(Heap::Space space);
@@ skipping 63 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_