- Consolidate verbose-gc output to be a single line which can be imported easily into spreadsheets.

runtime/vm/heap.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_HEAP_H_
 #define VM_HEAP_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/flags.h"
@@ skipping 25 matching lines @@
 
   enum ApiCallbacks {
     kIgnoreApiCallbacks,
     kInvokeApiCallbacks
   };
 
   enum GCReason {
     kNewSpace,
     kPromotionFailure,
     kOldSpace,
-    kCodeSpace,
     kFull,
     kGCAtAlloc,
     kGCTestCase,
   };
 
   // Default allocation sizes in MB for the old gen and code heaps.
   static const intptr_t kHeapSizeInMB = 512;
   static const intptr_t kCodeHeapSizeInMB = 18;
 
   ~Heap();
@@ skipping 114 matching lines @@
   // replaced.  A value of NULL disassociate an object from its peer.
   void SetPeer(RawObject* raw_obj, void* peer);
 
   // Retrieves the peer associated with an object.  Returns NULL if
   // there is no association.
   void* GetPeer(RawObject* raw_obj);
 
   // Returns the number of objects with a peer.
   int64_t PeerCount() const;
 
+  // Stats collection.
+  void RecordTime(int id, int64_t micros) {
+    ASSERT((id > 0) && (id < GCStats::kDataEntries));

[siva, 2013/01/04 01:40:12]

This asserts here that id should be > 0 but I see calls
like RecordTime(0, ...) in pages.cc

That should have asserted?

[Ivan Posva, 2013/01/04 02:14:31]

Done.

+    stats_.times_[id] = micros;
+  }
+
+  void RecordData(int id, intptr_t value) {
+    ASSERT((id > 0) && (id < GCStats::kDataEntries));

[siva, 2013/01/04 01:40:12]

This asserts here that id should be > 0 but I see calls
like RecordData(0, ...) in pages.cc

That should have asserted?

[Ivan Posva, 2013/01/04 02:14:31]

Done.

[Ivan Posva, 2013/01/04 02:14:31]

Done.

+    stats_.data_[id] = value;
+  }
+
  private:
+  class GCStats : public ValueObject {
+   public:
+    GCStats() {}
+    intptr_t num_;
+    Heap::Space space_;
+    Heap::GCReason reason_;
+
+    class Data : public ValueObject {
+    public:
+      Data() {}
+      int64_t micros_;
+      intptr_t new_used_;
+      intptr_t new_capacity_;
+      intptr_t old_used_;
+      intptr_t old_capacity_;
+
+      DISALLOW_COPY_AND_ASSIGN(Data);
+    };
+
+    enum {
+      kDataEntries = 4
+    };
+
+    Data before_;
+    Data after_;
+    int64_t times_[kDataEntries];
+    intptr_t data_[kDataEntries];
+
+    DISALLOW_COPY_AND_ASSIGN(GCStats);
+  };
+
   Heap();
 
   uword AllocateNew(intptr_t size);
   uword AllocateOld(intptr_t size, HeapPage::PageType type);
 
+  // GC stats collection.
+  void RecordBeforeGC(Space space, GCReason reason);
+  void RecordAfterGC();
+  void PrintStats();
+
   // The different spaces used for allocation.
   Scavenger* new_space_;
   PageSpace* old_space_;
 
+  // GC stats collection.
+  GCStats stats_;
+
   // The active heap trace.
   HeapTrace* heap_trace_;
 
   // This heap is in read-only mode: No allocation is allowed.
   bool read_only_;
 
   friend class GCTestHelper;
   DISALLOW_COPY_AND_ASSIGN(Heap);
 };
 
@@ skipping 11 matching lines @@
  public:
   NoGCScope() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(NoGCScope);
 };
 #endif  // defined(DEBUG)
 
 }  // namespace dart
 
 #endif  // VM_HEAP_H_