Teach the Observatory about Contexts. Factor out object graph information from the instance view.

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 21 matching lines @@
 
   /// The user-level type of this object.
   @reflectable String get type => _type;
   String _type;
 
   /// The vm type of this object.
   @reflectable String get vmType => _vmType;
   String _vmType;
 
   bool get isBool => vmType == 'Bool';
+  bool get isClosure => false;
+  bool get isContext => vmType == 'Context';
   bool get isDouble => vmType == 'Double';
   bool get isError => vmType == 'Error';
   bool get isInstance => vmType == 'Instance';
   bool get isInt => vmType == 'Smi' || vmType == 'Mint' || vmType == 'Bigint';
   bool get isList => vmType == 'GrowableObjectArray' || vmType == 'Array';
   bool get isNull => vmType == 'Null';
   bool get isSentinel => vmType == 'Sentinel';
   bool get isString => vmType == 'String';
   bool get isType => vmType == 'Type';
 
@@ skipping 32 matching lines @@
     var type = _stripRef(map['type']);
     var obj = null;
     assert(type != 'VM');
     switch (type) {
       case 'Class':
         obj = new Class._empty(owner);
         break;
       case 'Code':
         obj = new Code._empty(owner);
         break;
+      case 'Context':
+        obj = new Context._empty(owner);
+        break;
       case 'Counter':
         obj = new ServiceMetric._empty(owner);
         break;
       case 'Error':
         obj = new DartError._empty(owner);
         break;
       case 'Function':
         obj = new ServiceFunction._empty(owner);
         break;
       case 'Gauge':
@@ skipping 1359 matching lines @@
 
   Future<ServiceObject> get(String command) {
     return isolate.get(id + "/$command");
   }
 
   String toString() => 'Class($vmName)';
 }
 
 class Instance extends ServiceObject {
   @observable Class clazz;
-  @observable String valueAsString;
   @observable int size;
+  @observable String valueAsString;  // If primitive.
   @observable ServiceFunction closureFunc;  // If a closure.
+  @observable Context closureCtxt;  // If a closure.
   @observable String name;  // If a Type.
+  @observable int length; // If a List.
 
   @observable var typeClass;
-  @observable var length;
   @observable var fields;
   @observable var nativeFields;
   @observable var elements;
   @observable var userName;
 
   bool get isClosure => closureFunc != null;
 
   Instance._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
     // Extract full properties.
     _upgradeCollection(map, isolate);
 
     clazz = map['class'];
+    size = map['size'];
     valueAsString = map['valueAsString'];
-    size = map['size'];
     closureFunc = map['closureFunc'];
+    closureCtxt = map['closureCtxt'];
     name = map['name'];
+    length = map['length'];
 
     if (mapIsRef) {
       return;
     }
 
     nativeFields = map['nativeFields'];
     fields = map['fields'];
-    length = map['length'];
     elements = map['elements'];
     typeClass = map['type_class'];
     userName = map['user_name'];
 
     // We are fully loaded.
     _loaded = true;
   }
 
   String get shortName => valueAsString != null ? valueAsString : 'a ${clazz.name}';
 
   String toString() => 'Instance($shortName)';
 }
 
+
+class Context extends ServiceObject {
+  @observable Class clazz;
+  @observable int size;
+
+  @observable ServiceObject parentContext;
+  @observable var length;
+  @observable var variables;
+
+  bool get isClosure => closureFunc != null;
+
+  Context._empty(ServiceObjectOwner owner) : super._empty(owner);
+
+  void _update(ObservableMap map, bool mapIsRef) {
+    // Extract full properties.
+    _upgradeCollection(map, isolate);
+
+    size = map['size'];
+    length = map['length'];
+    parentContext = map['parent'];
+
+    if (mapIsRef) {
+      return;
+    }
+
+    clazz = map['class'];
+    variables = map['variables'];
+
+    // We are fully loaded.
+    _loaded = true;
+  }
+
+  String get shortName => valueAsString != null ? valueAsString : 'a ${clazz.name}';
+
+  String toString() => 'Context($length)';
+}
+
+
 // TODO(koda): Sync this with VM.
 class FunctionKind {
   final String _strValue;
   FunctionKind._internal(this._strValue);
   toString() => _strValue;
   bool isFake() => [kCollected, kNative, kTag, kReused].contains(this);
 
   static FunctionKind fromJSON(String value) {
     switch(value) {
       case 'kRegularFunction': return kRegularFunction;
@@ skipping 467 matching lines @@
   @reflectable int exclusiveTicks = 0;
   @reflectable int inclusiveTicks = 0;
   @reflectable int startAddress = 0;
   @reflectable int endAddress = 0;
   @reflectable final callers = new List<CodeCallCount>();
   @reflectable final callees = new List<CodeCallCount>();
   @reflectable final instructions = new ObservableList<CodeInstruction>();
   @reflectable final addressTicks = new ObservableMap<int, CodeTick>();
   @observable String formattedInclusiveTicks = '';
   @observable String formattedExclusiveTicks = '';
-  @observable ServiceMap objectPool;
+  @observable Instance objectPool;
   @observable ServiceFunction function;
   @observable Script script;
   @observable bool isOptimized = false;
   String name;
   String vmName;
 
   bool get canCache => true;
   bool get immutable => true;
 
   Code._empty(ServiceObjectOwner owner) : super._empty(owner);
@@ skipping 462 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);
     }
   }
 }