Reimplemented zone memory tracking to avoid race conditions that were causing crashes in the previo…

runtime/observatory/lib/src/elements/isolate_view.dart

 // Copyright (c) 2013, 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 isolate_view_element;
 
 import 'dart:async';
 import 'dart:html';
 import 'package:observatory/models.dart' as M;
 import 'package:observatory/src/elements/curly_block.dart';
@@ skipping 284 matching lines @@
                     ..children = [
                       new AnchorElement(href: Uris.objectStore(_isolate))
                         ..text = 'object store'
                     ]
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
-                    ..text = 'native memory usage high watermark'
-                    ..title = '''The maximum amount of native memory allocated
-                    by the isolate over it\'s life.''',
+                    ..text = 'zone capacity high watermark'
+                    ..title = '''The maximum amount of native zone memory
+                    allocated by the isolate over it\'s life.''',
                   new DivElement()
                     ..classes = ['memberValue']
-                    ..text = Utils.formatSize(_isolate.memoryHighWatermark)
-                    ..title = '${_isolate.memoryHighWatermark}B'
+                    ..text = Utils.formatSize(_isolate.zoneHighWatermark)
+                    ..title = '${_isolate.zoneHighWatermark}B'
                 ],
               new BRElement(),
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'libraries (${libraries.length})',
                   new DivElement()
                     ..classes = ['memberValue']
@@ skipping 48 matching lines @@
       ..children = [
         new SpanElement()
           ..text = '${t.id} ',
         new CurlyBlockElement(queue: _r.queue)
           ..content = [
             new DivElement()
               ..classes = ['indent']
               ..text = 'kind ${t.kindString}',
             new DivElement()
               ..classes = ['indent']
-              ..title = '${t.memoryHighWatermark}B'
+              ..title = '${t.zoneHighWatermark}B'
               ..text =
-              'native memory usage high watermark ${Utils.formatSize(t.memoryHighWatermark)}',
+              'zone capacity high watermark ' +
+              '${Utils.formatSize(t.zoneHighWatermark)}',
             new DivElement()
-              ..children = t.zones
-                .map((z) => new DivElement()
-                ..classes = ['indent']
-                ..children = [
-                  new DivElement()
-                    ..children = [
-                      new SpanElement()
-                        ..children = [
-                          // TODO(bkonyi): zones will always be empty. See
-                          // issue #28885.
-                          new SpanElement()
-                            ..text = 'zone ${index++} ',
-                          new CurlyBlockElement(queue: _r.queue)
-                            ..content = [
-                              new DivElement()
-                                ..classes = ['memberList']
-                                ..children = [
-                                  new DivElement()
-                                    ..classes = ['memberItem']
-                                    ..children = [
-                                      new SpanElement()
-                                        ..classes = ['memberName']
-                                        ..text = 'used ',
-                                      new SpanElement()
-                                        ..classes = ['memberValue']
-                                        ..title = '${z.used}B'
-                                        ..text =
-                                        Utils.formatSize(z.used)
-                                    ],
-                                  new DivElement()
-                                    ..classes = ['memberItem']
-                                    ..children = [
-                                        new SpanElement()
-                                          ..classes = ['memberName']
-                                          ..text = 'capacity',
-                                        new SpanElement()
-                                          ..classes = ['memberValue']
-                                          ..title = '${z.capacity}B'
-                                          ..text =
-                                          Utils.formatSize(z.capacity)
-                                    ]
-                                ]
-                            ]
-                        ]
-                    ]
-                ]
-          )]
+              ..classes = ['indent']
+              ..title = '${t.zoneCapacity}B'
+              ..text = 'current zone capacity ' +
+              '${Utils.formatSize(t.zoneCapacity)}',
+          ]
       ];
   }
 
   Future _loadExtraData() async {
     _function = null;
     _rootScript = null;
     final frame = M.topFrame(_isolate.pauseEvent);
     if (frame != null) {
       _function = await _functions.get(_isolate, frame.function.id);
     }
     if (_isolate.rootLibrary != null) {
       final rootLibrary =
           await _libraries.get(_isolate, _isolate.rootLibrary.id);
       _rootScript = rootLibrary.rootScript;
     }
     _r.dirty();
   }
 }