observatory: populate 'architecture' in VM, and add numerical vmId in Class.

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 315 matching lines @@
 abstract class VM extends ServiceObjectOwner {
   @reflectable VM get vm => this;
   @reflectable Isolate get isolate => null;
 
   @reflectable Iterable<Isolate> get isolates => _isolateCache.values;
 
   @reflectable String get link => '$id';
   @reflectable String relativeLink(String id) => '$id';
 
   @observable String version = 'unknown';
-  @observable String architecture = 'unknown';
+  @observable String targetCPU;

[Cutch, 2014/12/04 17:40:33]

check that the VM view still works. It probably references the 'architecture'
string.

[koda, 2014/12/04 17:41:51]

No, this field was completely unused until now.

+  @observable int architectureBits;
   @observable double uptime = 0.0;
   @observable bool assertsEnabled = false;
   @observable bool typeChecksEnabled = false;
   @observable String pid = '';
   @observable DateTime lastUpdate;
 
   VM() : super._empty(null) {
     name = 'vm';
     vmName = 'vm';
     _cache['vm'] = this;
@@ skipping 203 matching lines @@
   Future get onConnect;
   /// Completes when the VM disconnects or there was an error connecting.
   Future get onDisconnect;
 
   void _update(ObservableMap map, bool mapIsRef) {
     if (mapIsRef) {
       return;
     }
     _loaded = true;
     version = map['version'];
-    architecture = map['architecture'];
+    targetCPU = map['targetCPU'];
+    architectureBits = map['architectureBits'];
     uptime = map['uptime'];
     var dateInMillis = int.parse(map['date']);
     lastUpdate = new DateTime.fromMillisecondsSinceEpoch(dateInMillis);
     assertsEnabled = map['assertsEnabled'];
     pid = map['pid'];
     typeChecksEnabled = map['typeChecksEnabled'];
     _updateIsolates(map['isolates']);
   }
 
   void _updateIsolates(List newIsolates) {
@@ skipping 860 matching lines @@
   @observable bool isAbstract;
   @observable bool isConst;
   @observable bool isFinalized;
   @observable bool isPatch;
   @observable bool isImplemented;
 
   @observable int tokenPos;
   @observable int endTokenPos;
 
   @observable ServiceMap error;
+  @observable int vmCid;
 
   final Allocations newSpace = new Allocations();
   final Allocations oldSpace = new Allocations();
   final AllocationCount promotedByLastNewGC = new AllocationCount();
 
   bool get hasNoAllocations => newSpace.empty && oldSpace.empty;
 
   @reflectable final fields = new ObservableList<Field>();
   @reflectable final functions = new ObservableList<ServiceFunction>();
 
@@ skipping 49 matching lines @@
     functions.clear();
     functions.addAll(map['functions']);
     functions.sort(ServiceObject.LexicalSortName);
 
     superclass = map['super'];
     // Work-around Object not tracking its subclasses in the VM.
     if (superclass != null && superclass.name == "Object") {
       superclass._addSubclass(this);
     }
     error = map['error'];
+    var idPrefix = "classes/";
+    assert(id.startsWith(idPrefix));
+    vmCid = int.parse(id.substring(idPrefix.length));
 
     var allocationStats = map['allocationStats'];
     if (allocationStats != null) {
       newSpace.update(allocationStats['new']);
       oldSpace.update(allocationStats['old']);
       promotedByLastNewGC.instances = allocationStats['promotedInstances'];
       promotedByLastNewGC.bytes = allocationStats['promotedBytes'];
     }
   }
 
@@ skipping 1209 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);
     }
   }
 }