Resubmission of native memory allocation info surfacing in Observatory. Fixed crashing tests and st…

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 758 matching lines @@
     if (map == null) {
       return null;
     }
     var type = _stripRef(map['type']);
     if (type == 'VM') {
       // Update this VM object.
       update(map);
       return this;
     }
 
-    assert(type == 'Isolate');
     String id = map['id'];
-    if (!id.startsWith(_isolateIdPrefix)) {
-      // Currently the VM only supports upgrading Isolate ServiceObjects.
-      throw new UnimplementedError();
+    if ((id != null) && id.startsWith(_isolateIdPrefix)) {
+      // Check cache.
+      var isolate = _isolateCache[id];
+      if (isolate == null) {
+        // Add new isolate to the cache.
+        isolate = new ServiceObject._fromMap(this, map);
+        _isolateCache[id] = isolate;
+        _buildIsolateList();
+
+        // Eagerly load the isolate.
+        isolate.load().catchError((e, stack) {
+          Logger.root.info('Eagerly loading an isolate failed: $e\n$stack');
+        });
+      } else {
+        isolate.update(map);
+      }
+      return isolate;
     }
 
-    // Check cache.
-    var isolate = _isolateCache[id];
-    if (isolate == null) {
-      // Add new isolate to the cache.
-      isolate = new ServiceObject._fromMap(this, map);
-      _isolateCache[id] = isolate;
-      _buildIsolateList();
-
-      // Eagerly load the isolate.
-      isolate.load().catchError((e, stack) {
-        Logger.root.info('Eagerly loading an isolate failed: $e\n$stack');
-      });
-    } else {
-      isolate.update(map);
-    }
-    return isolate;
+    // Build the object from the map directly.
+    return new ServiceObject._fromMap(this, map);
   }
 
   // Note that this function does not reload the isolate if it found
   // in the cache.
   Future<ServiceObject> getIsolate(String isolateId) {
     if (!loaded) {
       // Trigger a VM load, then get the isolate.
       return load().then((_) => getIsolate(isolateId)).catchError(_ignoreError);
     }
     return new Future.value(_isolateCache[isolateId]);
@@ skipping 2190 matching lines @@
   bool isDart;
   ProfileFunction profile;
   Instance icDataArray;
   Field field;
 
   bool get immutable => false;
 
   ServiceFunction._empty(ServiceObject owner) : super._empty(owner);
 
   void _update(Map map, bool mapIsRef) {
-    _upgradeCollection(map, isolate);
+    _upgradeCollection(map, owner);
     super._update(map, mapIsRef);
 
     name = map['name'];
     vmName = (map.containsKey('_vmName') ? map['_vmName'] : name);
 
     dartOwner = map['owner'];
     kind = stringToFunctionKind(map['_kind']);
     isDart = M.isDartFunction(kind);
 
     if (dartOwner is ServiceFunction) {
@@ skipping 1601 matching lines @@
     var v = list[i];
     if ((v is Map) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is List) {
       _upgradeList(v, owner);
     } else if (v is Map) {
       _upgradeMap(v, owner);
     }
   }
 }