Track per-class promotion stats.

runtime/vm/class_table.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/class_table.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/heap.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
@@ skipping 175 matching lines @@
   }
 }
 
 
 void ClassHeapStats::Initialize() {
   pre_gc.Reset();
   post_gc.Reset();
   recent.Reset();
   accumulated.Reset();
   last_reset.Reset();
+  promoted_count = 0;
+  promoted_size = 0;
 }
 
 
 void ClassHeapStats::ResetAtNewGC() {
   pre_gc.new_count = post_gc.new_count + recent.new_count;
   pre_gc.new_size = post_gc.new_size + recent.new_size;
   // Accumulate allocations.
   accumulated.new_count += recent.new_count - last_reset.new_count;
   accumulated.new_size += recent.new_size - last_reset.new_size;
   last_reset.ResetNew();
   post_gc.ResetNew();
   recent.ResetNew();
+  old_pre_new_gc_count_ = recent.old_count;
+  old_pre_new_gc_size_ = recent.old_size;
 }
 
 
 void ClassHeapStats::ResetAtOldGC() {
   pre_gc.old_count = post_gc.old_count + recent.old_count;
   pre_gc.old_size = post_gc.old_size + recent.old_size;
   // Accumulate allocations.
   accumulated.old_count += recent.old_count - last_reset.old_count;
   accumulated.old_size += recent.old_size - last_reset.old_size;
   last_reset.ResetOld();
   post_gc.ResetOld();
   recent.ResetOld();
 }
 
 
 void ClassHeapStats::UpdateSize(intptr_t instance_size) {
   pre_gc.UpdateSize(instance_size);
   post_gc.UpdateSize(instance_size);
   recent.UpdateSize(instance_size);
   accumulated.UpdateSize(instance_size);
   last_reset.UpdateSize(instance_size);
+  promoted_size = promoted_count * instance_size;
+  old_pre_new_gc_size_ = old_pre_new_gc_count_ * instance_size;
 }
 
 
 void ClassHeapStats::ResetAccumulator() {
   // Remember how much was allocated so we can subtract this from the result
   // when printing.
   last_reset.new_count = recent.new_count;
   last_reset.new_size = recent.new_size;
   last_reset.old_count = recent.old_count;
   last_reset.old_size = recent.old_size;
   accumulated.Reset();
 }
 
 
+void ClassHeapStats::UpdatePromotedAfterNewGC() {
+  promoted_count = recent.old_count - old_pre_new_gc_count_;
+  promoted_size = recent.old_size - old_pre_new_gc_size_;
+}
+
+
 void ClassHeapStats::PrintToJSONObject(const Class& cls,
                                        JSONObject* obj) const {
   obj->AddProperty("type", "ClassHeapStats");
   obj->AddPropertyF("id", "allocationprofile/%" Pd "", cls.id());
   obj->AddProperty("class", cls);
   {
     JSONArray new_stats(obj, "new");
     new_stats.AddValue(pre_gc.new_count);
     new_stats.AddValue(pre_gc.new_size);
     new_stats.AddValue(post_gc.new_count);
@@ skipping 11 matching lines @@
     old_stats.AddValue(pre_gc.old_size);
     old_stats.AddValue(post_gc.old_count);
     old_stats.AddValue(post_gc.old_size);
     old_stats.AddValue(recent.old_count);
     old_stats.AddValue(recent.old_size);
     old_stats.AddValue64(accumulated.old_count + recent.old_count -
                          last_reset.old_count);
     old_stats.AddValue64(accumulated.old_size + recent.old_size -
                          last_reset.old_size);
   }
+  obj->AddProperty("promotedInstances", promoted_count);
+  obj->AddProperty("promotedBytes", promoted_size);
 }
 
 
 void ClassTable::UpdateAllocatedNew(intptr_t cid, intptr_t size) {
   ClassHeapStats* stats = PreliminaryStatsAt(cid);
   ASSERT(stats != NULL);
   ASSERT(size != 0);
   stats->recent.AddNew(size);
 }
 
@@ skipping 51 matching lines @@
 void ClassTable::ResetCountersNew() {
   for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
     predefined_class_heap_stats_table_[i].ResetAtNewGC();
   }
   for (intptr_t i = kNumPredefinedCids; i < top_; i++) {
     class_heap_stats_table_[i].ResetAtNewGC();
   }
 }
 
 
+void ClassTable::UpdatePromoted() {
+  for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
+    predefined_class_heap_stats_table_[i].UpdatePromotedAfterNewGC();
+  }
+  for (intptr_t i = kNumPredefinedCids; i < top_; i++) {
+    class_heap_stats_table_[i].UpdatePromotedAfterNewGC();
+  }
+}
+
+
 void ClassTable::AllocationProfilePrintJSON(JSONStream* stream) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   Heap* heap = isolate->heap();
   ASSERT(heap != NULL);
   JSONObject obj(stream);
   obj.AddProperty("type", "AllocationProfile");
   obj.AddProperty("id", "allocationprofile");
   obj.AddPropertyF(
       "dateLastAccumulatorReset",
@@ skipping 48 matching lines @@
 
 void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
   ClassHeapStats* stats = PreliminaryStatsAt(cid);
   ASSERT(stats != NULL);
   ASSERT(size >= 0);
   stats->post_gc.AddNew(size);
 }
 
 
 }  // namespace dart