Track live instance and allocation counts for classes

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 147 matching lines @@
 RawObject* Heap::FindOldObject(FindObjectVisitor* visitor) const {
   return old_space_->FindObject(visitor, HeapPage::kData);
 }
 
 
 void Heap::CollectGarbage(Space space, ApiCallbacks api_callbacks) {
   bool invoke_api_callbacks = (api_callbacks == kInvokeApiCallbacks);
   switch (space) {
     case kNew: {
       RecordBeforeGC(kNew, kNewSpace);
+      UpdateClassHeapStatsBeforeGC(kNew);
       new_space_->Scavenge(invoke_api_callbacks);
       RecordAfterGC();
       PrintStats();
       if (new_space_->HadPromotionFailure()) {
         // Old collections should call the API callbacks.
         CollectGarbage(kOld, kInvokeApiCallbacks);
       }
       break;
     }
     case kOld:
     case kCode: {
       bool promotion_failure = new_space_->HadPromotionFailure();
       RecordBeforeGC(kOld, promotion_failure ? kPromotionFailure : kOldSpace);
+      UpdateClassHeapStatsBeforeGC(kOld);
       old_space_->MarkSweep(invoke_api_callbacks);
       RecordAfterGC();
       PrintStats();
       UpdateObjectHistogram();
       break;
     }
     default:
       UNREACHABLE();
   }
 }
 
 
 void Heap::UpdateObjectHistogram() {
   Isolate* isolate = Isolate::Current();
   if (isolate->object_histogram() == NULL) return;
   isolate->object_histogram()->Collect();
 }
 
 
+void Heap::UpdateClassHeapStatsBeforeGC(Heap::Space space) {
+  Isolate* isolate = Isolate::Current();
+  ClassTable* class_table = isolate->class_table();
+  if (space == kNew) {
+    class_table->ResetCountersNew();
+  } else {
+    class_table->ResetCountersOld();
+  }
+}
+
+
 void Heap::CollectGarbage(Space space) {
   ApiCallbacks api_callbacks;
   if (space == kOld) {
     api_callbacks = kInvokeApiCallbacks;
   } else {
     api_callbacks = kIgnoreApiCallbacks;
   }
   CollectGarbage(space, api_callbacks);
 }
 
 
 void Heap::CollectAllGarbage() {
   RecordBeforeGC(kNew, kFull);
+  UpdateClassHeapStatsBeforeGC(kNew);
   new_space_->Scavenge(kInvokeApiCallbacks);
   RecordAfterGC();
   PrintStats();
   RecordBeforeGC(kOld, kFull);
+  UpdateClassHeapStatsBeforeGC(kOld);
   old_space_->MarkSweep(kInvokeApiCallbacks);
   RecordAfterGC();
   PrintStats();
   UpdateObjectHistogram();
 }
 
 
 void Heap::SetGrowthControlState(bool state) {
   old_space_->SetGrowthControlState(state);
 }
@@ skipping 87 matching lines @@
   return space == kNew ? new_space_->UsedInWords() : old_space_->UsedInWords();
 }
 
 
 intptr_t Heap::CapacityInWords(Space space) const {
   return space == kNew ? new_space_->CapacityInWords() :
                          old_space_->CapacityInWords();
 }
 
 
+int64_t Heap::GCTimeInMicros(Space space) const {
+  if (space == kNew) {
+    return new_space_->gc_time_micros();
+  }
+  return old_space_->gc_time_micros();
+}
+
+
+double Heap::GCTimeInSeconds(Space space) const {
+  int64_t micros = 0;
+  if (space == kNew) {
+    micros = new_space_->gc_time_micros();
+  } else {
+    micros = old_space_->gc_time_micros();
+  }
+  double seconds = static_cast<double>(micros) /

[Ivan Posva, 2014/01/17 06:53:16]

RoundMicrosecondsToSeconds

[Cutch, 2014/01/17 18:37:59]

Done.

+                   static_cast<double>(kMicrosecondsPerSecond);
+  return seconds;
+}
+
+
+intptr_t Heap::Collections(Space space) const {
+  if (space == kNew) {
+    return new_space_->collections();
+  }
+  return old_space_->collections();
+}
+
+
 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();
   isolate->VisitObjectPointers(&root_visitor, false,
                                StackFrameIterator::kDontValidateFrames);
   HeapProfilerWeakRootVisitor weak_root_visitor(&root_visitor);
@@ skipping 94 matching lines @@
   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_.old_used_in_words_ = old_space_->UsedInWords();
   stats_.after_.old_capacity_in_words_ = old_space_->CapacityInWords();
   ASSERT(gc_in_progress_);
   gc_in_progress_ = false;
 }
 
 
 void Heap::PrintStats() {
@@ skipping 64 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart