Corrected resubmssion of r34736.

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/isolate.h"
@@ skipping 196 matching lines @@
   Isolate* isolate = Isolate::Current();
   bool invoke_api_callbacks = (api_callbacks == kInvokeApiCallbacks);
   switch (space) {
     case kNew: {
       VMTagScope tagScope(isolate, VMTag::kGCNewSpaceTagId);
       RecordBeforeGC(kNew, kNewSpace);
       UpdateClassHeapStatsBeforeGC(kNew);
       new_space_->Scavenge(invoke_api_callbacks);
       RecordAfterGC();
       PrintStats();
+      // TODO(koda): Replace promotion failure tracking with
+      // old_space_->NeedsGarbageCollection.
       if (new_space_->HadPromotionFailure() || old_space_->NeedExternalGC()) {
         // Old collections should call the API callbacks.
         CollectGarbage(kOld, kInvokeApiCallbacks);
       }
       break;
     }
     case kOld:
     case kCode: {
       VMTagScope tagScope(isolate, VMTag::kGCOldSpaceTagId);
       bool promotion_failure = new_space_->HadPromotionFailure();
@@ skipping 233 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_in_words_ = new_space_->UsedInWords();
-  stats_.before_.new_capacity_in_words_ = new_space_->CapacityInWords();
-  stats_.before_.new_external_in_words_ = new_space_->ExternalInWords();
-  stats_.before_.old_used_in_words_ = old_space_->UsedInWords();
-  stats_.before_.old_capacity_in_words_ = old_space_->CapacityInWords();
-  stats_.before_.old_external_in_words_ = old_space_->ExternalInWords();
+  stats_.before_.new_ = new_space_->GetCurrentUsage();
+  stats_.before_.old_ = old_space_->GetCurrentUsage();
   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();
   int64_t delta = stats_.after_.micros_ - stats_.before_.micros_;
   if (stats_.space_ == kNew) {
     new_space_->AddGCTime(delta);
     new_space_->IncrementCollections();
   } else {
     old_space_->AddGCTime(delta);
     old_space_->IncrementCollections();
   }
-  stats_.after_.new_used_in_words_ = new_space_->UsedInWords();
-  stats_.after_.new_capacity_in_words_ = new_space_->CapacityInWords();
-  stats_.after_.new_external_in_words_ = new_space_->ExternalInWords();
-  stats_.after_.old_used_in_words_ = old_space_->UsedInWords();
-  stats_.after_.old_capacity_in_words_ = old_space_->CapacityInWords();
-  stats_.after_.old_external_in_words_ = old_space_->ExternalInWords();
+  stats_.after_.new_ = new_space_->GetCurrentUsage();
+  stats_.after_.old_ = old_space_->GetCurrentUsage();
   ASSERT(gc_in_progress_);
   gc_in_progress_ = false;
 }
 
 
 void Heap::PrintStats() {
   if (!FLAG_verbose_gc) return;
   Isolate* isolate = Isolate::Current();
 
   if ((FLAG_verbose_gc_hdr != 0) &&
@@ skipping 17 matching lines @@
     "%" Pd ", %" Pd ", "  // old gen: capacity before/after
     "%" Pd ", %" Pd ", "  // old gen: external 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_,
     MicrosecondsToSeconds(stats_.before_.micros_ - isolate->start_time()),
     MicrosecondsToMilliseconds(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_.new_external_in_words_),
-    RoundWordsToKB(stats_.after_.new_external_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_),
-    RoundWordsToKB(stats_.before_.old_external_in_words_),
-    RoundWordsToKB(stats_.after_.old_external_in_words_),
+    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_.new_.external_in_words),
+    RoundWordsToKB(stats_.after_.new_.external_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),
+    RoundWordsToKB(stats_.before_.old_.external_in_words),
+    RoundWordsToKB(stats_.after_.old_.external_in_words),
     MicrosecondsToMilliseconds(stats_.times_[0]),
     MicrosecondsToMilliseconds(stats_.times_[1]),
     MicrosecondsToMilliseconds(stats_.times_[2]),
     MicrosecondsToMilliseconds(stats_.times_[3]),
     stats_.data_[0],
     stats_.data_[1],
     stats_.data_[2],
     stats_.data_[3]);
 }
 
@@ skipping 17 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart