Show new and old space separately in allocation profile

runtime/bin/vmservice/client/lib/src/elements/heap_profile.dart

 // Copyright (c) 2014, 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.
 
 library heap_profile_element;
 
 import 'dart:html';
 import 'observatory_element.dart';
 import 'package:observatory/app.dart';
 import 'package:observatory/service.dart';
@@ skipping 27 matching lines @@
 
   HeapProfileElement.created() : super.created() {
     _newPieDataTable = new DataTable();
     _newPieDataTable.addColumn('string', 'Type');
     _newPieDataTable.addColumn('number', 'Size');
     _oldPieDataTable = new DataTable();
     _oldPieDataTable.addColumn('string', 'Type');
     _oldPieDataTable.addColumn('number', 'Size');
     var columns = [
       new SortedTableColumn('Class'),
-      new SortedTableColumn.withFormatter('Accumulator',
+      new SortedTableColumn.withFormatter('Accumulator Size (New)',
                                           Utils.formatSize),
-      new SortedTableColumn.withFormatter('Accumulator',
+      new SortedTableColumn.withFormatter('Accumulator (New)',
                                           Utils.formatCommaSeparated),
-      new SortedTableColumn.withFormatter('Accumulator (Old space)',
+      new SortedTableColumn.withFormatter('Current Size (New)',
                                           Utils.formatSize),
-      new SortedTableColumn.withFormatter('Accumulator (Old space)',
+      new SortedTableColumn.withFormatter('Current (New)',
                                           Utils.formatCommaSeparated),
-      new SortedTableColumn.withFormatter('Current',
+      new SortedTableColumn.withFormatter('Accumulator Size (Old)',
                                           Utils.formatSize),
-      new SortedTableColumn.withFormatter('Current',
+      new SortedTableColumn.withFormatter('Accumulator (Old)',
+                                          Utils.formatCommaSeparated),
+      new SortedTableColumn.withFormatter('Current Size (Old)',
+                                          Utils.formatSize),
+      new SortedTableColumn.withFormatter('Current (Old)',
                                           Utils.formatCommaSeparated)
     ];
     classTable = new SortedTable(columns);
     classTable.sortColumnIndex = 1;
   }
 
   void enteredView() {
     super.enteredView();
     _newPieChart = new Chart('PieChart',
         shadowRoot.querySelector('#newPieChart'));
@@ skipping 15 matching lines @@
       if (_classHasNoAllocations(cls)) {
         // If a class has no allocations, don't display it.
         continue;
       }
       var row = [cls['class'],
                  _combinedTableColumnValue(cls, 1),
                  _combinedTableColumnValue(cls, 2),
                  _combinedTableColumnValue(cls, 3),
                  _combinedTableColumnValue(cls, 4),
                  _combinedTableColumnValue(cls, 5),
-                 _combinedTableColumnValue(cls, 6)];
+                 _combinedTableColumnValue(cls, 6),
+                 _combinedTableColumnValue(cls, 7),
+                 _combinedTableColumnValue(cls, 8)];
       classTable.addRow(new SortedTableRow(row));
     }
     classTable.sort();
     _newPieDataTable.clearRows();
     var heap = profile['heaps']['new'];
     _newPieDataTable.addRow(['Used', heap['used']]);
     _newPieDataTable.addRow(['Free', heap['capacity'] - heap['used']]);
     _newPieDataTable.addRow(['External', heap['external']]);
     _oldPieDataTable.clearRows();
     heap = profile['heaps']['old'];
@@ skipping 31 matching lines @@
     for (var allocation in oldSpace) {
       if (allocation != 0) {
         return false;
       }
     }
     return true;
   }
 
   dynamic _combinedTableColumnValue(Map v, int index) {
     assert(index >= 0);
-    assert(index < 7);
+    assert(index < 9);
     switch (index) {
       case 0:
         return v['class']['user_name'];
       case 1:
-        return v['new'][ACCUMULATED_SIZE] +
-               v['old'][ACCUMULATED_SIZE];
+        return v['new'][ACCUMULATED_SIZE];
       case 2:
-        return v['new'][ACCUMULATED] +
-               v['old'][ACCUMULATED];
+        return v['new'][ACCUMULATED];
       case 3:
+        return v['new'][LIVE_AFTER_GC_SIZE] +
+               v['new'][ALLOCATED_SINCE_GC_SIZE];
+      case 4:
+        return v['new'][LIVE_AFTER_GC] +
+               v['new'][ALLOCATED_SINCE_GC];
+      case 5:
         return v['old'][ACCUMULATED_SIZE];
-      case 4:
+      case 6:
         return v['old'][ACCUMULATED];
-      case 5:
-        return v['new'][LIVE_AFTER_GC_SIZE] +
-               v['new'][ALLOCATED_SINCE_GC_SIZE] +
-               v['old'][LIVE_AFTER_GC_SIZE] +
+      case 7:
+        return v['old'][LIVE_AFTER_GC_SIZE] +
                v['old'][ALLOCATED_SINCE_GC_SIZE];
-      case 6:
-        return v['new'][LIVE_AFTER_GC] +
-               v['new'][ALLOCATED_SINCE_GC] +
-               v['old'][LIVE_AFTER_GC] +
+      case 8:
+        return  v['old'][LIVE_AFTER_GC] +
                v['old'][ALLOCATED_SINCE_GC];
     }
     throw new FallThroughError();
   }
 
   void refresh(var done) {
     if (profile == null) {
       return;
     }
     var isolate = profile.isolate;
@@ skipping 64 matching lines @@
 
   @observable String formattedTotalCollectionTime(bool newSpace) {
     if (profile == null) {
       return '';
     }
     String space = newSpace ? 'new' : 'old';
     Map heap = profile['heaps'][space];
     return '${Utils.formatSeconds(heap['time'])} secs';
   }
 }