- Convert heap sizes to words from bytes.

runtime/vm/heap.cc

 // 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.
 
 #include "vm/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/heap_histogram.h"
@@ skipping 26 matching lines @@
             "e.g: --old_gen_heap_size=1024 allocates a 1024MB old gen heap");
 
 Heap::Heap() : read_only_(false), gc_in_progress_(false) {
   for (int sel = 0;
        sel < kNumWeakSelectors;
        sel++) {
     new_weak_tables_[sel] = new WeakTable();
     old_weak_tables_[sel] = new WeakTable();
   }
   new_space_ = new Scavenger(this,
-                             (FLAG_new_gen_heap_size * MB),
+                             (FLAG_new_gen_heap_size * MBInWords),
                              kNewObjectAlignmentOffset);
-  old_space_ = new PageSpace(this, (FLAG_old_gen_heap_size * MB));
+  old_space_ = new PageSpace(this, (FLAG_old_gen_heap_size * MBInWords));
   stats_.num_ = 0;
 }
 
 
 Heap::~Heap() {
   delete new_space_;
   delete old_space_;
   for (int sel = 0;
        sel < kNumWeakSelectors;
        sel++) {
@@ skipping 184 matching lines @@
 
 
 void Heap::Init(Isolate* isolate) {
   ASSERT(isolate->heap() == NULL);
   Heap* heap = new Heap();
   isolate->set_heap(heap);
 }
 
 
 void Heap::StartEndAddress(uword* start, uword* end) const {
-  ASSERT(new_space_->capacity() != 0);
+  ASSERT(new_space_->CapacityInWords() != 0);
   new_space_->StartEndAddress(start, end);
-  if (old_space_->capacity() != 0) {
+  if (old_space_->CapacityInWords() != 0) {
     uword old_start;
     uword old_end;
     old_space_->StartEndAddress(&old_start, &old_end);
     *start = Utils::Minimum(old_start, *start);
     *end = Utils::Maximum(old_end, *end);
   }
   ASSERT(*start <= *end);
 }
 
 
@@ skipping 24 matching lines @@
   isolate->heap()->IteratePointers(&visitor);
   delete allocated_set;
   // Only returning a value so that Heap::Validate can be called from an ASSERT.
   return true;
 }
 
 
 void Heap::PrintSizes() const {
   OS::PrintErr("New space (%" Pd "k of %" Pd "k) "
                "Old space (%" Pd "k of %" Pd "k)\n",
-               (Used(kNew) / KB), (Capacity(kNew) / KB),
-               (Used(kOld) / KB), (Capacity(kOld) / KB));
+               (UsedInWords(kNew) / KBInWords),
+               (CapacityInWords(kNew) / KBInWords),
+               (UsedInWords(kOld) / KBInWords),
+               (CapacityInWords(kOld) / KBInWords));
 }
 
 
-intptr_t Heap::Used(Space space) const {
-  return space == kNew ? new_space_->in_use() : old_space_->in_use();
+intptr_t Heap::UsedInWords(Space space) const {
+  return space == kNew ? new_space_->UsedInWords() : old_space_->UsedInWords();
 }
 
 
-intptr_t Heap::Capacity(Space space) const {
-  return space == kNew ? new_space_->capacity() : old_space_->capacity();
+intptr_t Heap::CapacityInWords(Space space) const {
+  return space == kNew ? new_space_->CapacityInWords() :
+                         old_space_->CapacityInWords();
 }
 
 
 void Heap::Profile(Dart_FileWriteCallback callback, void* stream) const {
   HeapProfiler profiler(callback, stream);
 
   // Dump the root set.
   HeapProfilerRootVisitor root_visitor(&profiler);
   Isolate* isolate = Isolate::Current();
   Isolate* vm_isolate = Dart::vm_isolate();
@@ skipping 80 matching lines @@
 }
 
 
 void Heap::RecordBeforeGC(Space space, GCReason reason) {
   ASSERT(!gc_in_progress_);
   gc_in_progress_ = true;
   stats_.num_++;
   stats_.space_ = space;
   stats_.reason_ = reason;
   stats_.before_.micros_ = OS::GetCurrentTimeMicros();
-  stats_.before_.new_used_ = new_space_->in_use();
-  stats_.before_.new_capacity_ = new_space_->capacity();
-  stats_.before_.old_used_ = old_space_->in_use();
-  stats_.before_.old_capacity_ = old_space_->capacity();
+  stats_.before_.new_used_in_words_ = new_space_->UsedInWords();
+  stats_.before_.new_capacity_in_words_ = new_space_->CapacityInWords();
+  stats_.before_.old_used_in_words_ = old_space_->UsedInWords();
+  stats_.before_.old_capacity_in_words_ = old_space_->CapacityInWords();
   stats_.times_[0] = 0;
   stats_.times_[1] = 0;
   stats_.times_[2] = 0;
   stats_.times_[3] = 0;
   stats_.data_[0] = 0;
   stats_.data_[1] = 0;
   stats_.data_[2] = 0;
   stats_.data_[3] = 0;
 }
 
 
 void Heap::RecordAfterGC() {
   stats_.after_.micros_ = OS::GetCurrentTimeMicros();
-  stats_.after_.new_used_ = new_space_->in_use();
-  stats_.after_.new_capacity_ = new_space_->capacity();
-  stats_.after_.old_used_ = old_space_->in_use();
-  stats_.after_.old_capacity_ = old_space_->capacity();
+  stats_.after_.new_used_in_words_ = new_space_->UsedInWords();
+  stats_.after_.new_capacity_in_words_ = new_space_->CapacityInWords();
+  stats_.after_.old_used_in_words_ = old_space_->UsedInWords();
+  stats_.after_.old_capacity_in_words_ = old_space_->CapacityInWords();
   ASSERT(gc_in_progress_);
   gc_in_progress_ = false;
 }
 
 
-static intptr_t RoundToKB(intptr_t memory_size) {
-  return (memory_size + (KB >> 1)) >> KBLog2;
-}
-
-
-static double RoundToSecs(int64_t micros) {
-  const int k1M = 1000000;  // Converting us to secs.
-  return static_cast<double>(micros + (k1M / 2)) / k1M;
-}
-
-
-static double RoundToMillis(int64_t micros) {
-  const int k1K = 1000;  // Conversting us to ms.
-  return static_cast<double>(micros + (k1K / 2)) / k1K;
-}
-
-
 void Heap::PrintStats() {
   if (!FLAG_verbose_gc) return;
   Isolate* isolate = Isolate::Current();
 
   if ((FLAG_verbose_gc_hdr != 0) &&
       (((stats_.num_ - 1) % FLAG_verbose_gc_hdr) == 0)) {
     OS::PrintErr("[    GC    |  space  | count | start | gc time | "
                  "new gen (KB) | old gen (KB) | timers | data ]\n"
                  "[ (isolate)| (reason)|       |  (s)  |   (ms)  | "
                  " used , cap  |  used , cap  |  (ms)  |      ]\n");
   }
 
   const char* space_str = stats_.space_ == kNew ? "Scavenge" : "Mark-Sweep";
   OS::PrintErr(
     "[ GC(%" Pd64 "): %s(%s), "  // GC(isolate), space(reason)
     "%" Pd ", "  // count
     "%.3f, "  // start time
     "%.3f, "  // total time
     "%" Pd ", %" Pd ", "  // new gen: in use before/after
     "%" Pd ", %" Pd ", "  // new gen: capacity before/after
     "%" Pd ", %" Pd ", "  // old gen: in use before/after
     "%" Pd ", %" Pd ", "  // old gen: capacity before/after
     "%.3f, %.3f, %.3f, %.3f, "  // times
     "%" Pd ", %" Pd ", %" Pd ", %" Pd ", "  // data
     "]\n",  // End with a comma to make it easier to import in spreadsheets.
     isolate->main_port(), space_str, GCReasonToString(stats_.reason_),
     stats_.num_,
-    RoundToSecs(stats_.before_.micros_ - isolate->start_time()),
-    RoundToMillis(stats_.after_.micros_ - stats_.before_.micros_),
-    RoundToKB(stats_.before_.new_used_), RoundToKB(stats_.after_.new_used_),
-    RoundToKB(stats_.before_.new_capacity_),
-    RoundToKB(stats_.after_.new_capacity_),
-    RoundToKB(stats_.before_.old_used_), RoundToKB(stats_.after_.old_used_),
-    RoundToKB(stats_.before_.old_capacity_),
-    RoundToKB(stats_.after_.old_capacity_),
-    RoundToMillis(stats_.times_[0]),
-    RoundToMillis(stats_.times_[1]),
-    RoundToMillis(stats_.times_[2]),
-    RoundToMillis(stats_.times_[3]),
+    RoundMicrosecondsToSeconds(stats_.before_.micros_ - isolate->start_time()),
+    RoundMicrosecondsToMilliseconds(stats_.after_.micros_ -
+                                    stats_.before_.micros_),
+    RoundWordsToKB(stats_.before_.new_used_in_words_),
+    RoundWordsToKB(stats_.after_.new_used_in_words_),
+    RoundWordsToKB(stats_.before_.new_capacity_in_words_),
+    RoundWordsToKB(stats_.after_.new_capacity_in_words_),
+    RoundWordsToKB(stats_.before_.old_used_in_words_),
+    RoundWordsToKB(stats_.after_.old_used_in_words_),
+    RoundWordsToKB(stats_.before_.old_capacity_in_words_),
+    RoundWordsToKB(stats_.after_.old_capacity_in_words_),
+    RoundMicrosecondsToMilliseconds(stats_.times_[0]),
+    RoundMicrosecondsToMilliseconds(stats_.times_[1]),
+    RoundMicrosecondsToMilliseconds(stats_.times_[2]),
+    RoundMicrosecondsToMilliseconds(stats_.times_[3]),
     stats_.data_[0],
     stats_.data_[1],
     stats_.data_[2],
     stats_.data_[3]);
 }
 
 
 #if defined(DEBUG)
 NoGCScope::NoGCScope() : StackResource(Isolate::Current()) {
   isolate()->IncrementNoGCScopeDepth();
@@ skipping 13 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart