Restore "Add current rss and embedder name to Observatory"

runtime/observatory/lib/src/service/object.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.
 
 part of service;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 651 matching lines @@
   final Map<String, Isolate> _isolateCache = <String, Isolate>{};
 
   // The list of live isolates, ordered by isolate start time.
   final List<Isolate> isolates = <Isolate>[];
 
   final List<Service> services = <Service>[];
 
   String version = 'unknown';
   String hostCPU;
   String targetCPU;
+  String embedder;
   int architectureBits;
   bool assertsEnabled = false;
   bool typeChecksEnabled = false;
   int nativeZoneMemoryUsage = 0;
   int pid = 0;
   int heapAllocatedMemoryUsage = 0;
   int heapAllocationCount = 0;
-  int maxRSS = 0;
+  int maxRSS;
+  int currentRSS;
   bool profileVM = false;
   DateTime startTime;
   DateTime refreshTime;
   Duration get upTime {
     if (startTime == null) {
       return null;
     }
     return (new DateTime.now().difference(startTime));
   }
 
@@ skipping 281 matching lines @@
     hostCPU = map['hostCPU'];
     targetCPU = map['targetCPU'];
     architectureBits = map['architectureBits'];
     int startTimeMillis = map['startTime'];
     startTime = new DateTime.fromMillisecondsSinceEpoch(startTimeMillis);
     refreshTime = new DateTime.now();
     if (map['_nativeZoneMemoryUsage'] != null) {
       nativeZoneMemoryUsage = map['_nativeZoneMemoryUsage'];
     }
     pid = map['pid'];
-    if (map['_heapAllocatedMemoryUsage'] != null) {
-      heapAllocatedMemoryUsage = map['_heapAllocatedMemoryUsage'];
-    }
-    if (map['_heapAllocationCount'] != null) {
-      heapAllocationCount = map['_heapAllocationCount'];
-    }
+    heapAllocatedMemoryUsage = map['_heapAllocatedMemoryUsage'];
+    heapAllocationCount = map['_heapAllocationCount'];
+    embedder = map['_embedder'];
     maxRSS = map['_maxRSS'];
+    currentRSS = map['_currentRSS'];
     profileVM = map['_profilerMode'] == 'VM';
     assertsEnabled = map['_assertsEnabled'];
     typeChecksEnabled = map['_typeChecksEnabled'];
     _removeDeadIsolates(map['isolates']);
   }
 
   // Reload all isolates.
   Future reloadIsolates() {
     var reloads = [];
     for (var isolate in isolates) {
@@ skipping 3704 matching lines @@
   final String alias;
   final String method;
   final String service;
 
   Service(this.alias, this.method, this.service) {
     assert(this.alias != null);
     assert(this.method != null);
     assert(this.service != null);
   }
 }