Add accumulator to allocation profiler

runtime/vm/class_table.h

 // 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.
 
 #ifndef VM_CLASS_TABLE_H_
 #define VM_CLASS_TABLE_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 
 namespace dart {
 
 class Class;
 class ClassStats;
 class JSONArray;
 class JSONStream;
 class ObjectPointerVisitor;
 class RawClass;
 
+template<typename T>
+class AllocStats {
+ public:
+  T new_count;
+  T new_size;
+  T old_count;
+  T old_size;
+
+  void ResetNew() {
+    new_count = 0;
+    new_size = 0;
+  }
+
+  void AddNew(T size) {
+    new_count++;
+    new_size += size;
+  }
+
+  void ResetOld() {
+    old_count = 0;
+    old_size = 0;
+  }
+
+  void AddOld(T size) {
+    old_count++;
+    old_size += size;
+  }
+
+  void Reset() {
+    new_count = 0;
+    new_size = 0;
+    old_count = 0;
+    old_size = 0;
+  }
+};
 
 class ClassHeapStats {
  public:
-  // Total allocated before GC.
-  intptr_t allocated_before_gc_old_space;
-  intptr_t allocated_before_gc_new_space;
-  intptr_t allocated_size_before_gc_old_space;
-  intptr_t allocated_size_before_gc_new_space;
-
+  // Snapshot before GC.
+  AllocStats<intptr_t> pre_gc;
   // Live after GC.
-  intptr_t live_after_gc_old_space;
-  intptr_t live_after_gc_new_space;
-  intptr_t live_size_after_gc_old_space;
-  intptr_t live_size_after_gc_new_space;
-
-  // Allocated since GC.
-  intptr_t allocated_since_gc_new_space;
-  intptr_t allocated_since_gc_old_space;
-  intptr_t allocated_size_since_gc_new_space;
-  intptr_t allocated_size_since_gc_old_space;
+  AllocStats<intptr_t> post_gc;
+  // Allocations since the last GC.
+  AllocStats<intptr_t> recent;
+  // Accumulated (across GC) allocations .
+  AllocStats<int64_t> accumulated;
+  // Snapshot of recent at the time of the last reset.
+  AllocStats<intptr_t> last_reset;
 
   static intptr_t allocated_since_gc_new_space_offset() {
-    return OFFSET_OF(ClassHeapStats, allocated_since_gc_new_space);
+    return OFFSET_OF(ClassHeapStats, recent) +
+           OFFSET_OF(AllocStats<intptr_t>, new_count);
   }
   static intptr_t allocated_since_gc_old_space_offset() {
-    return OFFSET_OF(ClassHeapStats, allocated_since_gc_old_space);
+    return OFFSET_OF(ClassHeapStats, recent) +
+           OFFSET_OF(AllocStats<intptr_t>, old_count);
   }
   static intptr_t allocated_size_since_gc_new_space_offset() {
-    return OFFSET_OF(ClassHeapStats, allocated_size_since_gc_new_space);
+    return OFFSET_OF(ClassHeapStats, recent) +
+           OFFSET_OF(AllocStats<intptr_t>, new_size);
   }
   static intptr_t allocated_size_since_gc_old_space_offset() {
-    return OFFSET_OF(ClassHeapStats, allocated_size_since_gc_old_space);
+    return OFFSET_OF(ClassHeapStats, recent) +
+           OFFSET_OF(AllocStats<intptr_t>, old_size);
   }
 
   void Initialize();
   void ResetAtNewGC();
   void ResetAtOldGC();
+  void ResetAccumulator();
   void UpdateSize(intptr_t instance_size);
   void PrintTOJSONArray(const Class& cls, JSONArray* array);
 };
 
 
 class ClassTable {
  public:
   ClassTable();
   ~ClassTable();
 
@@ skipping 39 matching lines @@
     return reinterpret_cast<uword>(predefined_class_heap_stats_table_);
   }
 
   // Used by generated code.
   uword ClassStatsTableAddress() {
     return reinterpret_cast<uword>(&class_heap_stats_table_);
   }
 
 
   void AllocationProfilePrintToJSONStream(JSONStream* stream);
+  void ResetAllocationAccumulators();
 
  private:
   friend class MarkingVisitor;
   friend class ScavengerVisitor;
   friend class ClassHeapStatsTestHelper;
   static const int initial_capacity_ = 512;
   static const int capacity_increment_ = 256;
 
   static bool ShouldUpdateSizeForClassId(intptr_t cid);
 
   intptr_t top_;
   intptr_t capacity_;
 
   RawClass** table_;
   ClassHeapStats* class_heap_stats_table_;
 
   ClassHeapStats* predefined_class_heap_stats_table_;
 
   ClassHeapStats* StatsAt(intptr_t cid);
   void UpdateLiveOld(intptr_t cid, intptr_t size);
   void UpdateLiveNew(intptr_t cid, intptr_t size);
 
   DISALLOW_COPY_AND_ASSIGN(ClassTable);
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_TABLE_H_