Track external allocated memory for weak persistent handles.

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 84 matching lines @@
       case kCode:
         return old_space_->TryAllocate(size,
                                        HeapPage::kExecutable,
                                        growth_policy);
       default:
         UNREACHABLE();
     }
     return 0;
   }
 
+  // Track external data. The 'ref' pointer is only used to determine which
+  // space to use. Non-heap and VM heap objects are charged to old space.
+  void AllocateExternal(intptr_t size, RawObject* ref);

[Ivan Posva, 2014/03/05 21:21:23]

Do we allow non-heap objects (aka Smis) do be used as reference in weak handles?

[koda, 2014/03/05 21:52:08]

Yes, I believe we do. See my test
WeakPersistentHandleExternalAllocationSizeOddReferents.

+  void FreeExternal(intptr_t size, RawObject* ref);
+
   // 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 40 matching lines @@
 
   // Initialize the heap and register it with the isolate.
   static void Init(Isolate* isolate);
 
   // Verify that all pointers in the heap point to the heap.
   bool Verify() const;
 
   // Print heap sizes.
   void PrintSizes() const;
 
-  // Return amount of memory used and capacity in a space.
+  // Return amount of memory used and capacity in a space, including external.
   intptr_t UsedInWords(Space space) const;
   intptr_t CapacityInWords(Space space) const;
+  intptr_t ExternalAllocatedInWords(Space space) const;

[Ivan Posva, 2014/03/05 21:21:23]

How about ExternalInWords?

[koda, 2014/03/05 21:52:08]

Done.

   // Return the amount of GCing in microseconds.
   int64_t GCTimeInMicros(Space space) const;
 
   intptr_t Collections(Space space) const;
   // Returns the [lowest, highest) addresses in the heap.
   void StartEndAddress(uword* start, uword* end) const;
 
   ObjectSet* CreateAllocatedObjectSet() const;
 
   static const char* GCReasonToString(GCReason gc_reason);
@@ skipping 147 matching lines @@
   NoHeapGrowthControlScope();
   ~NoHeapGrowthControlScope();
  private:
   bool current_growth_controller_state_;
   DISALLOW_COPY_AND_ASSIGN(NoHeapGrowthControlScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_