- Convert heap sizes to words from bytes.

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 "vm/freelist.h"
 #include "vm/globals.h"
 #include "vm/virtual_memory.h"
@@ skipping 103 matching lines @@
                       int heap_growth_rate,
                       int garbage_collection_time_ratio);
   ~PageSpaceController();
 
   bool CanGrowPageSpace(intptr_t size_in_bytes);
 
   // A garbage collection is considered as successful if more than
   // heap_growth_ratio % of memory got deallocated by the garbage collector.
   // In this case garbage collection will be performed next time. Otherwise
   // the heap will grow.
-  void EvaluateGarbageCollection(intptr_t in_use_before, intptr_t in_use_after,
+  void EvaluateGarbageCollection(intptr_t used_before_in_words,
+                                 intptr_t used_after_in_words,
                                  int64_t start, int64_t end);
 
   int64_t last_code_collection_in_us() { return last_code_collection_in_us_; }
   void set_last_code_collection_in_us(int64_t t) {
     last_code_collection_in_us_ = t;
   }
 
   void set_is_enabled(bool state) {
     is_enabled_ = state;
   }
@@ skipping 36 matching lines @@
  public:
   // TODO(iposva): Determine heap sizes and tune the page size accordingly.
   static const intptr_t kPageSize = 256 * KB;
   static const intptr_t kPageAlignment = kPageSize;
 
   enum GrowthPolicy {
     kControlGrowth,
     kForceGrowth
   };
 
-  PageSpace(Heap* heap, intptr_t max_capacity);
+  PageSpace(Heap* heap, intptr_t max_capacity_in_words);
   ~PageSpace();
 
   uword TryAllocate(intptr_t size,
                     HeapPage::PageType type = HeapPage::kData,
                     GrowthPolicy growth_policy = kControlGrowth);
 
-  intptr_t in_use() const { return in_use_; }
-  intptr_t capacity() const { return capacity_; }
+  intptr_t UsedInWords() const { return used_in_words_; }
+  intptr_t CapacityInWords() const { return capacity_in_words_; }
 
   bool Contains(uword addr) const;
   bool Contains(uword addr, HeapPage::PageType type) const;
   bool IsValidAddress(uword addr) const {
     return Contains(addr);
   }
 
   void VisitObjects(ObjectVisitor* visitor) const;
   void VisitObjectPointers(ObjectPointerVisitor* visitor) const;
 
@@ skipping 37 matching lines @@
   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) {
-    ASSERT(capacity_ <= max_capacity_);
-    return increase <= (max_capacity_ - capacity_);
+  bool CanIncreaseCapacityInWords(intptr_t increase_in_words) {
+    ASSERT(capacity_in_words_ <= max_capacity_in_words_);
+    return increase_in_words <= (max_capacity_in_words_ - capacity_in_words_);
   }
 
   FreeList freelist_[HeapPage::kNumPageTypes];
 
   Heap* heap_;
 
   HeapPage* pages_;
   HeapPage* pages_tail_;
   HeapPage* large_pages_;
 
   // Various sizes being tracked for this generation.
-  intptr_t max_capacity_;
-  intptr_t capacity_;
-  intptr_t in_use_;
+  intptr_t max_capacity_in_words_;
+  intptr_t capacity_in_words_;
+  intptr_t used_in_words_;
 
   // Keep track whether a MarkSweep is currently running.
   bool sweeping_;
 
   PageSpaceController page_space_controller_;
 
   friend class PageSpaceController;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageSpace);
 };
 
 }  // namespace dart
 
 #endif  // VM_PAGES_H_