Teach the Observatory about WeakProperties (ephemerons).

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 32 matching lines @@
   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';
+  bool get isWeakProperty => vmType == 'WeakProperty';
 
   /// The complete service url of this object.
   @reflectable String get link => _owner.relativeLink(_id);
 
   /// Has this object been fully loaded?
   bool get loaded => _loaded;
   bool _loaded = false;
   // TODO(turnidge): Make loaded observable and get rid of loading
   // from Isolate.
 
@@ skipping 50 matching lines @@
       case 'Bool':
       case 'Double':
       case 'GrowableObjectArray':
       case 'Instance':
       case 'Mint':
       case 'Null':
       case 'Sentinel':  // TODO(rmacnak): Separate this out.
       case 'Smi':
       case 'String':
       case 'Type':
+      case 'WeakProperty':
         obj = new Instance._empty(owner);
         break;
       case 'Isolate':
         obj = new Isolate._empty(owner.vm);
         break;
       case 'Library':
         obj = new Library._empty(owner);
         break;
       case 'ServiceError':
         obj = new ServiceError._empty(owner);
@@ skipping 1347 matching lines @@
   @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 fields;
   @observable var nativeFields;
   @observable var elements;
   @observable var userName;
+  @observable Instance key;  // If a WeakProperty.
+  @observable Instance value;  // If a WeakProperty.

[Cutch, 2014/09/04 15:27:24]

I wonder if we should start subclassing Instance so we don't keep adding fields
for each instance type. Just a thought, not necessary for this change.

[rmacnak, 2014/09/04 20:36:07]

Right, and there are a lot more special Instance types this doesn't even handle
yet.

 
   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'];
     closureFunc = map['closureFunc'];
     closureCtxt = map['closureCtxt'];
     name = map['name'];
     length = map['length'];
 
     if (mapIsRef) {
       return;
     }
 
     nativeFields = map['nativeFields'];
     fields = map['fields'];
     elements = map['elements'];
     typeClass = map['type_class'];
     userName = map['user_name'];
+    key = map['key'];
+    value = map['value'];
 
     // We are fully loaded.
     _loaded = true;
   }
 
   String get shortName => valueAsString != null ? valueAsString : 'a ${clazz.name}';
 
   String toString() => 'Instance($shortName)';
 }
 
@@ skipping 998 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);
     }
   }
 }