Add current rss and embedder name to Observatory

runtime/observatory/lib/src/elements/memory/graph.dart

Index: runtime/observatory/lib/src/elements/memory/graph.dart
diff --git a/runtime/observatory/lib/src/elements/memory/graph.dart b/runtime/observatory/lib/src/elements/memory/graph.dart
index a89ba43edf070b9f1ed8d2dc9d239294b62ffa9c..d6112db1c2384de03e5fe6fef59cdfed0dcaea5e 100644
--- a/runtime/observatory/lib/src/elements/memory/graph.dart
+++ b/runtime/observatory/lib/src/elements/memory/graph.dart
@@ -41,7 +41,8 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
   Stream<IsolateSelectedEvent> get onIsolateSelected =>
       _onIsolateSelected.stream;
 
-  M.VM _vm;
+  M.VMRef _vm;
+  M.VMRepository _vms;
   M.IsolateRepository _isolates;
   M.EventRepository _events;
   StreamSubscription _onGCSubscription;
@@ -49,17 +50,19 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
   StreamSubscription _onConnectionClosedSubscription;
   Timer _onTimer;
 
-  M.VM get vm => _vm;
+  M.VMRef get vm => _vm;
 
-  factory MemoryGraphElement(
-      M.VM vm, M.IsolateRepository isolates, M.EventRepository events,
+  factory MemoryGraphElement(M.VMRef vm, M.VMRepository vms,
+      M.IsolateRepository isolates, M.EventRepository events,
       {RenderingQueue queue}) {
     assert(vm != null);
+    assert(vms != null);
     assert(isolates != null);
     assert(events != null);
     MemoryGraphElement e = document.createElement(tag.name);
     e._r = new RenderingScheduler(e, queue: queue);
     e._vm = vm;
+    e._vms = vms;
     e._isolates = isolates;
     e._events = events;
     return e;
@@ -70,13 +73,13 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
     var sample = now.subtract(_window);
     while (sample.isBefore(now)) {
       _ts.add(sample);
-      _vmSamples.add(0);
+      _vmSamples.add(<int>[0, 0]);
       _isolateUsedSamples.add([]);
       _isolateFreeSamples.add([]);
       sample = sample.add(_period);
     }
     _ts.add(now);
-    _vmSamples.add(0);
+    _vmSamples.add(<int>[0, 0]);
     _isolateUsedSamples.add([]);
     _isolateFreeSamples.add([]);
   }
@@ -109,7 +112,7 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
   }
 
   final List<DateTime> _ts = <DateTime>[];
-  final List<int> _vmSamples = <int>[];
+  final List<List<int>> _vmSamples = <List<int>>[];
   final List<M.IsolateRef> _seenIsolates = <M.IsolateRef>[];
   final List<List<int>> _isolateUsedSamples = <List<int>>[];
   final List<List<int>> _isolateFreeSamples = <List<int>>[];
@@ -146,13 +149,14 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
     final rows = new List.generate(_ts.length, (sampleIndex) {
       final free = _isolateFreeSamples[sampleIndex];
       final used = _isolateUsedSamples[sampleIndex];
+      final isolates = _isolateIndex.keys.expand((key) {
+        final isolateIndex = _isolateIndex[key];
+        return <int>[free[isolateIndex], used[isolateIndex]];
+      });
       return [
         _ts[sampleIndex].difference(now).inMicroseconds,
-        _vmSamples[sampleIndex]
-      ]..addAll(_isolateIndex.keys.expand((key) {
-          final isolateIndex = _isolateIndex[key];
-          return [free[isolateIndex], used[isolateIndex]];
-        }));
+        _vmSamples[sampleIndex][1] ?? 1000000
+      ]..addAll(isolates);
     });
 
     final scale = new LinearScale()..domain = [(-_window).inMicroseconds, 0];
@@ -195,9 +199,10 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
     _running = true;
     final now = new DateTime.now();
     final start = now.subtract(_window);
+    final vm = await _vms.get(_vm);
     // The Service classes order isolates from the older to the newer
     final isolates =
-        (await Future.wait(_vm.isolates.map(_isolates.get))).reversed.toList();
+        (await Future.wait(vm.isolates.map(_isolates.get))).reversed.toList();
     while (_ts.first.isBefore(start)) {
       _ts.removeAt(0);
       _vmSamples.removeAt(0);
@@ -252,7 +257,7 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
       _isolateUsedSamples.add(isolateUsedSample);
       _isolateFreeSamples.add(isolateFreeSample);
 
-      _vmSamples.add(vm.heapAllocatedMemoryUsage);
+      _vmSamples.add(<int>[vm.currentRSS, vm.heapAllocatedMemoryUsage]);
 
       _ts.add(now);
     }
@@ -267,7 +272,7 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
     _isolateUsedSamples.add(isolateUsedSample);
     _isolateFreeSamples.add(isolateFreeSample);
 
-    _vmSamples.add(vm.heapAllocatedMemoryUsage);
+    _vmSamples.add(<int>[vm.currentRSS, vm.heapAllocatedMemoryUsage]);
 
     _ts.add(now);
     _r.dirty();
@@ -332,10 +337,24 @@ class MemoryGraphElement extends HtmlElement implements Renderable {
         ..children = [
           new DivElement()
             ..classes = ['hovercard-measure-label']
-            ..text = 'Heap',
+            ..text = 'Total Memory Usage',
+          new DivElement()
+            ..classes = ['hovercard-measure-value']
+            ..text = _vmSamples[row][0] != null
+                ? Utils.formatSize(_vmSamples[row][0])
+                : "unavailable",
+        ],
+      new DivElement()
+        ..classes = ['hovercard-measure', 'hovercard-multi']
+        ..children = [
+          new DivElement()
+            ..classes = ['hovercard-measure-label']
+            ..text = 'Native Heap',
           new DivElement()
             ..classes = ['hovercard-measure-value']
-            ..text = Utils.formatSize(_vmSamples[row]),
+            ..text = _vmSamples[row][1] != null
+                ? Utils.formatSize(_vmSamples[row][1])
+                : 'unavailable',
         ]
     ];