vmservice protocol cleanup

runtime/bin/vmservice/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;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 1057 matching lines @@
 
   void _update(ObservableMap map, bool mapIsRef) {
     _loaded = !mapIsRef;
 
     // TODO(turnidge): Currently _map.clear() prevents us from
     // upgrading an already upgraded submap.  Is clearing really the
     // right thing to do here?
     _map.clear();
     _map.addAll(map);
 
-    name = _map['user_name'];
-    vmName = _map['name'];
+    name = _map['name'];
+    vmName = (_map.containsKey('vmName') ? _map['vmName'] : name);
     _upgradeValues();
   }
 
   // Forward Map interface calls.
   void addAll(Map other) => _map.addAll(other);
   void clear() => _map.clear();
   bool containsValue(v) => _map.containsValue(v);
   bool containsKey(k) => _map.containsKey(k);
   void forEach(Function f) => _map.forEach(f);
   putIfAbsent(key, Function ifAbsent) => _map.putIfAbsent(key, ifAbsent);
@@ skipping 119 matching lines @@
 
   Library._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
     url = map['url'];
     var shortUrl = url;
     if (url.startsWith('file://') ||
         url.startsWith('http://')) {
       shortUrl = url.substring(url.lastIndexOf('/') + 1);
     }
-    name = map['user_name'];
+    name = map['name'];
     if (name.isEmpty) {
+      // When there is no name for a library, use the shortUrl.
       name = shortUrl;
     }
-    vmName = map['name'];
+    vmName = (map.containsKey('vmName') ? map['vmName'] : name);
     if (mapIsRef) {
       return;
     }
     _loaded = true;
     _upgradeCollection(map, isolate);
     imports.clear();
     imports.addAll(removeDuplicatesAndSortLexical(map['imports']));
     scripts.clear();
     scripts.addAll(removeDuplicatesAndSortLexical(map['scripts']));
     classes.clear();
@@ skipping 75 matching lines @@
   bool get canCache => true;
   bool get immutable => false;
 
   Class._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   String toString() {
     return 'Service Class: $vmName';
   }
 
   void _update(ObservableMap map, bool mapIsRef) {
-    name = map['user_name'];
-    vmName = map['name'];
+    name = map['name'];
+    vmName = (map.containsKey('vmName') ? map['vmName'] : name);
 
     if (mapIsRef) {
       return;
     }
 
     // We are fully loaded.
     _loaded = true;
 
     // Extract full properties.
     _upgradeCollection(map, isolate);
@@ skipping 116 matching lines @@
   @observable bool isInlinable;
   @observable FunctionKind kind;
   @observable int deoptimizations;
   @observable String qualifiedName;
   @observable int usageCounter;
   @observable bool isDart;
 
   ServiceFunction._empty(ServiceObject owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
-    name = map['user_name'];
-    vmName = map['name'];
+    name = map['name'];
+    vmName = (map.containsKey('vmName') ? map['vmName'] : name);
 
     _upgradeCollection(map, isolate);
 
     owningClass = map.containsKey('owningClass') ? map['owningClass'] : null;
     owningLibrary = map.containsKey('owningLibrary') ? map['owningLibrary'] : null;
     kind = FunctionKind.fromJSON(map['kind']);
     isDart = !kind.isFake();
 
     if (mapIsRef) { return; }
 
@@ skipping 515 matching lines @@
     }
     formattedInclusiveTicks =
         '${formatPercent(inclusiveTicks, totalSamplesInProfile)} '
         '($inclusiveTicks)';
     formattedExclusiveTicks =
         '${formatPercent(exclusiveTicks, totalSamplesInProfile)} '
         '($exclusiveTicks)';
   }
 
   void _update(ObservableMap m, bool mapIsRef) {
-    name = m['user_name'];
-    vmName = m['name'];
+    name = m['name'];
+    vmName = (m.containsKey('vmName') ? m['vmName'] : name);
     isOptimized = m['isOptimized'] != null ? m['isOptimized'] : false;
     kind = CodeKind.fromString(m['kind']);
     startAddress = int.parse(m['start'], radix:16);
     endAddress = int.parse(m['end'], radix:16);
     function = isolate.getFromMap(m['function']);
     objectPool = isolate.getFromMap(m['object_pool']);
     var disassembly = m['disassembly'];
     if (disassembly != null) {
       _processDisassembly(disassembly);
     }
@@ skipping 253 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }