Track live instance and allocation counts for classes

runtime/vm/class_table.cc

Index: runtime/vm/class_table.cc
diff --git a/runtime/vm/class_table.cc b/runtime/vm/class_table.cc
index e85053a6d9cf5eb652c9f35946ae7343a929f40e..8daad51d6f1870c83c82e72146a1652b6fe48dea 100644
--- a/runtime/vm/class_table.cc
+++ b/runtime/vm/class_table.cc
@@ -14,7 +14,9 @@ namespace dart {
 DEFINE_FLAG(bool, print_class_table, false, "Print initial class table.");
 
 ClassTable::ClassTable()
-    : top_(kNumPredefinedCids), capacity_(0), table_(NULL) {
+    : top_(kNumPredefinedCids), capacity_(0), table_(NULL),
+      class_heap_stats_table_(NULL),
+      predefined_class_heap_stats_table_(NULL) {
   if (Dart::vm_isolate() == NULL) {
     capacity_ = initial_capacity_;
     table_ = reinterpret_cast<RawClass**>(
@@ -31,12 +33,26 @@ ClassTable::ClassTable()
     table_[kFreeListElement] = vm_class_table->At(kFreeListElement);
     table_[kDynamicCid] = vm_class_table->At(kDynamicCid);
     table_[kVoidCid] = vm_class_table->At(kVoidCid);
+    predefined_class_heap_stats_table_ = reinterpret_cast<ClassHeapStats*>(

[Ivan Posva, 2014/01/14 22:54:23]

Duplicate allocation here.

[Cutch, 2014/01/15 19:49:49]

Done.

+        calloc(kNumPredefinedCids, sizeof(ClassHeapStats)));  // NOLINT
+    class_heap_stats_table_ = reinterpret_cast<ClassHeapStats*>(
+        calloc(capacity_, sizeof(ClassHeapStats)));  // NOLINT
+    for (intptr_t i = 0; i < capacity_; i++) {
+      class_heap_stats_table_[i].Initialize();
+    }
+  }
+  predefined_class_heap_stats_table_ = reinterpret_cast<ClassHeapStats*>(
+        calloc(kNumPredefinedCids, sizeof(ClassHeapStats)));  // NOLINT
+  for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
+    predefined_class_heap_stats_table_[i].Initialize();
   }
 }
 
 
 ClassTable::~ClassTable() {
   free(table_);
+  free(predefined_class_heap_stats_table_);
+  free(class_heap_stats_table_);
 }
 
 
@@ -62,11 +78,16 @@ void ClassTable::Register(const Class& cls) {
       intptr_t new_capacity = capacity_ + capacity_increment_;
       RawClass** new_table = reinterpret_cast<RawClass**>(
           realloc(table_, new_capacity * sizeof(RawClass*)));  // NOLINT
+      ClassHeapStats* new_stats_table = reinterpret_cast<ClassHeapStats*>(
+          realloc(class_heap_stats_table_,
+                  new_capacity * sizeof(ClassHeapStats)));  // NOLINT
       for (intptr_t i = capacity_; i < new_capacity; i++) {
         new_table[i] = NULL;
+        new_stats_table[i].Initialize();
       }
       capacity_ = new_capacity;
       table_ = new_table;
+      class_heap_stats_table_ = new_stats_table;
     }
     ASSERT(top_ < capacity_);
     cls.set_id(top_);
@@ -111,4 +132,139 @@ void ClassTable::PrintToJSONStream(JSONStream* stream) {
   }
 }
 
+
+void ClassHeapStats::Initialize() {
+  allocated_before_gc_old_space = 0;
+  allocated_before_gc_new_space = 0;
+  allocated_size_before_gc_old_space = 0;
+  allocated_size_before_gc_new_space = 0;
+  live_after_gc_old_space = 0;
+  live_after_gc_new_space = 0;
+  live_size_after_gc_old_space = 0;
+  live_size_after_gc_new_space = 0;
+  allocated_since_gc_new_space = 0;
+  allocated_since_gc_old_space = 0;
+  allocated_size_since_gc_new_space = 0;
+  allocated_size_since_gc_old_space = 0;
+}
+
+
+void ClassHeapStats::ResetAtNewGC() {
+  allocated_before_gc_new_space = live_after_gc_new_space +
+                                  allocated_since_gc_new_space;
+  allocated_size_before_gc_new_space = live_size_after_gc_new_space +
+                                       allocated_size_since_gc_new_space;
+  live_after_gc_new_space = 0;
+  live_size_after_gc_new_space = 0;
+  allocated_since_gc_new_space = 0;
+  allocated_size_since_gc_new_space = 0;
+}
+
+
+void ClassHeapStats::ResetAtOldGC() {
+  allocated_before_gc_old_space = live_after_gc_old_space +
+                                  allocated_since_gc_old_space;
+  allocated_size_before_gc_old_space = live_size_after_gc_old_space +
+                                       allocated_size_since_gc_old_space;
+  live_after_gc_old_space = 0;
+  live_size_after_gc_old_space = 0;
+  allocated_since_gc_old_space = 0;
+  allocated_size_since_gc_old_space = 0;
+}
+
+
+void ClassTable::UpdateAllocatedNew(intptr_t cid, intptr_t size) {
+  ClassHeapStats* stats = StatsAt(cid);
+  ASSERT(stats != NULL);
+  ASSERT(size != 0);
+  stats->allocated_since_gc_new_space++;
+  stats->allocated_size_since_gc_new_space += size;
+}
+
+
+void ClassTable::UpdateAllocatedOld(intptr_t cid, intptr_t size) {
+  ClassHeapStats* stats = StatsAt(cid);
+  ASSERT(stats != NULL);
+  ASSERT(size != 0);
+  stats->allocated_since_gc_old_space++;
+  stats->allocated_size_since_gc_old_space += size;
+}
+
+
+//  #define DEBUG_PRINT
+
+#if defined(DEBUG_PRINT)
+static void PrintClassHeapStats(intptr_t cid, const ClassHeapStats& stat) {
+  int new_new = static_cast<int>(stat.new_count_since_gc_new_space);
+  int new_old = static_cast<int>(stat.new_count_since_gc_old_space);
+  int b_new = static_cast<int>(stat.new_size_since_gc_new_space);
+  int b_old = static_cast<int>(stat.new_size_since_gc_old_space);
+  printf("%d (%d %d) [%d %d]\n", static_cast<int>(cid),
+                                 new_new, b_new, new_old, b_old);
+}
+#endif
+
+
+bool ClassTable::CollectInstanceSizesForClass(intptr_t cid) {
+  // We only collect size information for classes which do not have
+  // fixed lengths.
+  if ((cid == kArrayCid) ||
+      RawObject::IsOneByteStringClassId(cid) ||
+      RawObject::IsTwoByteStringClassId(cid) ||
+      RawObject::IsTypedDataClassId(cid) ||
+      (cid == kContextCid)) {
+    return true;
+  }
+  return false;
+}
+
+
+ClassHeapStats* ClassTable::StatsAt(intptr_t cid) {
+  ASSERT(cid > 0);
+  if (cid < kNumPredefinedCids) {
+    return &predefined_class_heap_stats_table_[cid];
+  }
+  ASSERT(cid < top_);
+  return &class_heap_stats_table_[cid];
+}
+
+
+void ClassTable::ResetCountersOld() {
+  for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
+    predefined_class_heap_stats_table_[i].ResetAtOldGC();
+  }
+  for (intptr_t i = kNumPredefinedCids; i < top_; i++) {
+    class_heap_stats_table_[i].ResetAtOldGC();
+  }
+}
+
+
+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::UpdateLiveOld(intptr_t cid, intptr_t size) {
+  ClassHeapStats* stats = StatsAt(cid);
+  ASSERT(stats != NULL);
+  ASSERT(size != 0);
+  stats->live_after_gc_old_space++;
+  stats->live_size_after_gc_old_space += size;
+}
+
+
+void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
+  ClassHeapStats* stats = StatsAt(cid);
+  ASSERT(stats != NULL);
+  ASSERT(size != 0);
+  stats->live_after_gc_new_space++;
+  stats->live_size_after_gc_new_space += size;
+}
+
+
 }  // namespace dart