VM: Refactor allocation stats code and remove duplicate code.

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/growable_array.h"
 #include "vm/heap.h"
 #include "vm/object.h"
@@ skipping 404 matching lines @@
 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();
   }
 }
 
 
+ClassHeapStats** ClassTable::TableAddressFor(intptr_t cid) {
+  return (cid < kNumPredefinedCids)
+      ? &predefined_class_heap_stats_table_
+      : &class_heap_stats_table_;
+}
+
+
+intptr_t ClassTable::TableOffsetFor(intptr_t cid) {
+  return (cid < kNumPredefinedCids)
+      ? OFFSET_OF(ClassTable, predefined_class_heap_stats_table_)
+      : OFFSET_OF(ClassTable, class_heap_stats_table_);
+}
+
+
+intptr_t ClassTable::ClassOffsetFor(intptr_t cid) {
+  return cid * sizeof(ClassHeapStats);  // NOLINT
+}
+
+
+ClassHeapStats** ClassTable::CountAddressFor(intptr_t cid,
+                                             bool is_new_space,
+                                             intptr_t* offset) {
+  const intptr_t class_offset = ClassOffsetFor(cid);
+  const intptr_t count_field_offset = is_new_space
+      ? ClassHeapStats::allocated_since_gc_new_space_offset()
+      : ClassHeapStats::allocated_since_gc_old_space_offset();
+  *offset = class_offset + count_field_offset;
+  return TableAddressFor(cid);
+}
+
+
+ClassHeapStats** ClassTable::StateAddressFor(intptr_t cid, intptr_t* offset) {
+  const uword class_offset = ClassOffsetFor(cid);
+  const uword state_offset = ClassHeapStats::state_offset();
+  *offset = class_offset + state_offset;
+  return TableAddressFor(cid);
+}
+
+
+intptr_t ClassTable::SizeOffsetFor(intptr_t cid, bool is_new_space) {
+  const uword class_offset = ClassOffsetFor(cid);
+  const uword size_field_offset = is_new_space
+      ? ClassHeapStats::allocated_size_since_gc_new_space_offset()
+      : ClassHeapStats::allocated_size_since_gc_old_space_offset();
+  return class_offset + size_field_offset;
+}
+
+
 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.AddPropertyF(
       "dateLastAccumulatorReset",
       "%" Pd64 "",
@@ skipping 47 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