Restore "Add current rss and embedder name to Observatory"

runtime/observatory/lib/src/elements/vm_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 vm_view_element;
 
 import 'dart:async';
 import 'dart:html';
 import 'package:observatory/models.dart' as M;
 import 'package:observatory/src/elements/helpers/nav_bar.dart';
@@ skipping 16 matching lines @@
     NavRefreshElement.tag,
     NavNotifyElement.tag,
     ViewFooterElement.tag
   ]);
 
   RenderingScheduler<VMViewElement> _r;
 
   Stream<RenderedEvent<VMViewElement>> get onRendered => _r.onRendered;
 
   M.VM _vm;
+  M.VMRepository _vms;
   M.EventRepository _events;
   M.NotificationRepository _notifications;
   M.IsolateRepository _isolates;
   M.ScriptRepository _scripts;
   StreamSubscription _vmSubscription;
   StreamSubscription _startSubscription;
   StreamSubscription _exitSubscription;
 
   M.VMRef get vm => _vm;
   M.NotificationRepository get notifications => _notifications;
 
   factory VMViewElement(
       M.VM vm,
+      M.VMRepository vms,
       M.EventRepository events,
       M.NotificationRepository notifications,
       M.IsolateRepository isolates,
       M.ScriptRepository scripts,
       {RenderingQueue queue}) {
     assert(vm != null);
+    assert(vms != null);
     assert(events != null);
     assert(notifications != null);
+    assert(isolates != null);
+    assert(scripts != null);
     VMViewElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._vm = vm;
+    e._vms = vms;
     e._events = events;
     e._notifications = notifications;
     e._isolates = isolates;
     e._scripts = scripts;
     return e;
   }
 
   VMViewElement.created() : super.created();
 
   @override
@@ skipping 21 matching lines @@
   void render() {
     final uptime = new DateTime.now().difference(_vm.startTime);
     final isolates = _vm.isolates.toList();
     children = [
       navBar([
         new NavTopMenuElement(queue: _r.queue),
         new NavVMMenuElement(_vm, _events, queue: _r.queue),
         new NavRefreshElement(queue: _r.queue)
           ..onRefresh.listen((e) async {
             e.element.disabled = true;
+            _vm = await _vms.get(_vm);
             _r.dirty();
           }),
         new NavNotifyElement(_notifications, queue: _r.queue)
       ]),
       new DivElement()
         ..classes = ['content-centered-big']
-        ..children = [
+        ..children = <HtmlElement>[
           new HeadingElement.h1()..text = 'VM',
           new HRElement(),
           new DivElement()
             ..classes = ['memberList']
             ..children = [
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'name',
                   new DivElement()
                     ..classes = ['memberValue']
                     ..text = _vm.displayName
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'version',
                   new DivElement()
                     ..classes = ['memberValue']
                     ..text = _vm.version
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
+                  new DivElement()
+                    ..classes = ['memberName']
+                    ..text = 'embedder',
+                  new DivElement()
+                    ..classes = ['memberValue']
+                    ..text = _vm.embedder ?? "UNKNOWN"
+                ],
+              new DivElement()
+                ..classes = ['memberItem']
+                ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'started at',
                   new DivElement()
                     ..classes = ['memberValue']
                     ..text = '${_vm.startTime}'
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
@@ skipping 25 matching lines @@
                     ..text = '${_vm.pid}'
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'peak memory',
                   new DivElement()
                     ..classes = ['memberValue']
-                    ..text = Utils.formatSize(_vm.maxRSS)
+                    ..text = _vm.maxRSS != null
+                        ? Utils.formatSize(_vm.maxRSS)
+                        : "unavailable"
                 ],
               new DivElement()
                 ..classes = ['memberItem']
+                ..children = [
+                  new DivElement()
+                    ..classes = ['memberName']
+                    ..text = 'current memory',
+                  new DivElement()
+                    ..classes = ['memberValue']
+                    ..text = _vm.currentRSS != null
+                        ? Utils.formatSize(_vm.currentRSS)
+                        : "unavailable"
+                ],
+              new DivElement()
+                ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'native zone memory',
                   new DivElement()
                     ..classes = ['memberValue']
                     ..text = Utils.formatSize(_vm.nativeZoneMemoryUsage)
                     ..title = '${_vm.nativeZoneMemoryUsage} bytes'
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'native heap memory',
                   new DivElement()
                     ..classes = ['memberValue']
-                    ..text = Utils.formatSize(_vm.heapAllocatedMemoryUsage)
-                    ..title = '${_vm.heapAllocatedMemoryUsage} bytes'
+                    ..text = _vm.heapAllocatedMemoryUsage != null
+                        ? Utils.formatSize(_vm.heapAllocatedMemoryUsage)
+                        : 'unavailable'
+                    ..title = _vm.heapAllocatedMemoryUsage != null
+                        ? '${_vm.heapAllocatedMemoryUsage} bytes'
+                        : null
                 ],
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..text = 'native heap allocation count',
                   new DivElement()
                     ..classes = ['memberValue']
-                    ..text = '${_vm.heapAllocationCount}'
+                    ..text = _vm.heapAllocationCount != null
+                        ? '${_vm.heapAllocationCount}'
+                        : 'unavailable'
                 ],
               new BRElement(),
               new DivElement()
                 ..classes = ['memberItem']
                 ..children = [
                   new DivElement()
                     ..classes = ['memberName']
                     ..children = [
                       new SpanElement()..text = 'see ',
                       new AnchorElement(href: Uris.flags())..text = 'flags'
@@ skipping 33 matching lines @@
                               queue: _r.queue)
                         ],
                       new HRElement()
                     ])
                 .toList(),
           new ViewFooterElement(queue: _r.queue)
         ]
     ];
   }
 }