- Disassociate old page size from new allocatable size.

runtime/vm/pages.h

 // Copyright (c) 2011, 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_PAGES_H_
 #define VM_PAGES_H_
 
 #include <map>
 
 #include "vm/freelist.h"
@@ skipping 23 matching lines @@
     return memory_->Contains(addr);
   }
 
   uword object_start() const {
     return (reinterpret_cast<uword>(this) + ObjectStartOffset());
   }
   uword object_end() const {
     return object_end_;
   }
 
-  void set_used(uword used) { used_ = used; }
-  uword used() const { return used_; }
-  void AddUsed(uword size) {
-    used_ += size;
-  }
-
   PageType type() const {
     return executable_ ? kExecutable : kData;
   }
 
   void VisitObjects(ObjectVisitor* visitor) const;
   void VisitObjectPointers(ObjectPointerVisitor* visitor) const;
 
   RawObject* FindObject(FindObjectVisitor* visitor) const;
 
   void WriteProtect(bool read_only);
@@ skipping 10 matching lines @@
 
   static HeapPage* Initialize(VirtualMemory* memory, PageType type);
   static HeapPage* Allocate(intptr_t size, PageType type);
 
   // Deallocate the virtual memory backing this page. The page pointer to this
   // page becomes immediately inaccessible.
   void Deallocate();
 
   VirtualMemory* memory_;
   HeapPage* next_;
-  uword used_;
   uword object_end_;
   bool executable_;
 
   friend class PageSpace;
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(HeapPage);
 };
 
 
@@ skipping 92 matching lines @@
                     GrowthPolicy growth_policy = kControlGrowth);
 
   intptr_t in_use() const { return in_use_; }
   intptr_t capacity() const { return capacity_; }
 
   bool Contains(uword addr) const;
   bool Contains(uword addr, HeapPage::PageType type) const;
   bool IsValidAddress(uword addr) const {
     return Contains(addr);
   }
-  static bool IsPageAllocatableSize(intptr_t size) {
-    return size <= kAllocatablePageSize;
-  }
 
   void VisitObjects(ObjectVisitor* visitor) const;
   void VisitObjectPointers(ObjectPointerVisitor* visitor) const;
 
   RawObject* FindObject(FindObjectVisitor* visitor,
                         HeapPage::PageType type) const;
 
   // Collect the garbage in the page space using mark-sweep.
   void MarkSweep(bool invoke_api_callbacks);
 
-  static HeapPage* PageFor(RawObject* raw_obj) {
-    return reinterpret_cast<HeapPage*>(
-        RawObject::ToAddr(raw_obj) & ~(kPageSize -1));
-  }
-
   void StartEndAddress(uword* start, uword* end) const;
 
   void SetGrowthControlState(bool state) {
     page_space_controller_.set_is_enabled(state);
   }
 
   bool GrowthControlState() {
     return page_space_controller_.is_enabled();
   }
 
@@ skipping 17 matching lines @@
     kResetFreeLists = 1,
     kSweepPages = 2,
     kSweepLargePages = 3,
     // Data
     kGarbageRatio = 0,
     kGCTimeFraction = 1,
     kPageGrowth = 2,
     kAllowedGrowth = 3
   };
 
-  static const intptr_t kAllocatablePageSize = kPageSize - sizeof(HeapPage);
+  static const intptr_t kAllocatablePageSize = 64 * KB;
 
   HeapPage* AllocatePage(HeapPage::PageType type);
   void FreePage(HeapPage* page, HeapPage* previous_page);
   HeapPage* AllocateLargePage(intptr_t size, HeapPage::PageType type);
   void FreeLargePage(HeapPage* page, HeapPage* previous_page);
   void FreePages(HeapPage* pages);
 
   static intptr_t LargePageSizeFor(intptr_t size);
 
   bool CanIncreaseCapacity(intptr_t increase) {
@@ skipping 22 matching lines @@
   PageSpaceController page_space_controller_;
 
   friend class PageSpaceController;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageSpace);
 };
 
 }  // namespace dart
 
 #endif  // VM_PAGES_H_