Add a VM page to the observatory.

runtime/bin/vmservice/client/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 {
-  Isolate _isolate;
+  /// The owner of this [ServiceObject].  This can be an [Isolate], a
+  /// [VM], or null.
+  @reflectable ServiceObject get owner => _owner;
+  ServiceObject _owner;
 
-  /// Owning isolate.
-  @reflectable Isolate get isolate => _isolate;
+  /// The [VM] which owns this [ServiceObject].
+  @reflectable VM get vm {
+    if (owner == null) {
+      assert(this is VM);
+      return this;
+    } else if (owner is VM) {
+      return owner;
+    } else {
+      assert(owner.owner is VM);
+      return owner.owner;
+    }
+  }
 
-  /// Owning vm.
-  @reflectable VM get vm => _isolate.vm;
+  /// The [Isolate] which owns this [ServiceObject].  May be null.
+  @reflectable Isolate get isolate {
+    if (owner == null) {
+      return null;
+    } else if (this is Isolate) {
+      return this;
+    } else {
+      assert(owner is Isolate);
+      return owner;
+    }
+  }
+
+  /// The id of this object.
+  @reflectable String get id => _id;
+  String _id;
+
+  /// The service type of this object.
+  @reflectable String get serviceType => _serviceType;
+  String _serviceType;
 
   /// The complete service url of this object.
   @reflectable String get link => isolate.relativeLink(_id);
 
   /// The complete service url of this object with a '#/' prefix.
-  @reflectable String get hashLink => isolate.relativeHashLink(_id);
+  @reflectable String get hashLink => '#/${link}';
   set hashLink(var o) { /* silence polymer */ }
 
-  String _id;
-  /// The id of this object.
-  @reflectable String get id => _id;
-
-  String _serviceType;
-  /// The service type of this object.
-  @reflectable String get serviceType => _serviceType;
-
+  /// Returns true if [this] has only been partially initialized via
+  /// a reference. See [load].
+  bool isRef() => _ref;
   bool _ref;
 
   @observable String name;
   @observable String vmName;
+  @observable String mainPort;
 
-  ServiceObject(this._isolate, this._id, this._serviceType) {
+  ServiceObject(this._owner, this._id, this._serviceType) {
     _ref = isRefType(_serviceType);
     _serviceType = stripRef(_serviceType);
     _created();
   }
 
-  ServiceObject.fromMap(this._isolate, ObservableMap m) {
-    assert(isServiceMap(m));
-    _id = m['id'];
-    _ref = isRefType(m['type']);
-    _serviceType = stripRef(m['type']);
+  ServiceObject.fromMap(this._owner, ObservableMap map) {
+    assert(isServiceMap(map));
+    _id = map['id'];
+    _ref = isRefType(map['type']);
+    _serviceType = stripRef(map['type']);
+    update(map);
     _created();
-    update(m);
   }
 
   /// If [this] was created from a reference, load the full object
   /// from the service by calling [reload]. Else, return [this].
   Future<ServiceObject> load() {
     if (!_ref) {
       // Not a reference.
       return new Future.value(this);
     }
     // Call reload which will fill in the entire object.
     return reload();
   }
 
   /// Reload [this]. Returns a future which completes to [this] or
   /// a [ServiceError].
   Future<ServiceObject> reload() {
-    assert(isolate != null);
     if (id == '') {
       // Errors don't have ids.
       assert(serviceType == 'Error');
       return new Future.value(this);
     }
-    return isolate.vm.getAsMap(link).then(update);
+    return vm.getAsMap(link).then(update);
   }
 
   /// Update [this] using [m] as a source. [m] can be a reference.
   ServiceObject update(ObservableMap m) {
     // Assert that m is a service map.
     assert(ServiceObject.isServiceMap(m));
     if ((m['type'] == 'Error') && (_serviceType != 'Error')) {
       // Got an unexpected error. Don't update the object.
       return _upgradeToServiceObject(vm, isolate, m);
     }
     // TODO(johnmccutchan): Should we allow for a ServiceObject's id
     // or type to change?
     _id = m['id'];
     _serviceType = stripRef(m['type']);
     _update(m);
     return this;
   }
 
   // update internal state from [map]. [map] can be a reference.
   void _update(ObservableMap map);
 
-  /// Returns true if [this] has only been partially initialized via
-  /// a reference. See [load].
-  bool isRef() => _ref;
-
   void _created() {
     var refNotice = _ref ? ' Created from reference.' : '';
     Logger.root.info('Created ServiceObject for \'${_id}\' with type '
                      '\'${_serviceType}\'.' + refNotice);
   }
 
+  // ------------------------------------------------------
+
   /// Returns true if [map] is a service map. i.e. it has the following keys:
   /// 'id' and a 'type'.
   static bool isServiceMap(ObservableMap m) {
     return (m != null) && (m['id'] != null) && (m['type'] != null);
   }
 
   /// Returns true if [type] is a reference type. i.e. it begins with an
   /// '@' character.
   static bool isRefType(String type) {
     return type.startsWith('@');
   }
 
   /// Returns the unreffed version of [type].
   static String stripRef(String type) {
     if (!isRefType(type)) {
       return type;
     }
     // Strip off the '@' character.
     return type.substring(1);
   }
 }
 
 /// State for a VM being inspected.
-abstract class VM extends Observable {
+abstract class VM extends ServiceObject {
   @reflectable IsolateList _isolates;
   @reflectable IsolateList get isolates => _isolates;
 
+  @reflectable String get link => "$id";
+
+  @observable String version = 'unknown';
+  @observable String architecture = 'unknown';
+  @observable double uptime = 0.0;
+
   void _initOnce() {
     assert(_isolates == null);
     _isolates = new IsolateList(this);
+    name = "vm";
+    vmName = "vm";
   }
 
-  VM() {
+  VM() : super(null, "vm", "VM") {
     _initOnce();
   }
 
-  /// Get [id] as an [ObservableMap] from the service directly.
+  static final RegExp _currentIsolateMatcher = new RegExp(r'isolates/\d+');
+  static final RegExp _currentObjectMatcher = new RegExp(r'isolates/\d+(/|$)');
+
+  String _parseObjectId(String id) {
+    Match m = _currentObjectMatcher.matchAsPrefix(id);
+    if (m == null) {
+      return null;
+    }
+    return m.input.substring(m.end);
+  }
+
+  String _parseIsolateId(String id) {
+    Match m = _currentIsolateMatcher.matchAsPrefix(id);
+    if (m == null) {
+      print("NO MATCH");

[Cutch, 2014/03/20 18:25:56]

Logger.root.warning ?

[turnidge, 2014/03/20 19:08:02]

Actually this happens legitimately on the /vm page itself.

+      return '';
+    }
+    return id.substring(0, m.end);
+  }
+
+  Future<ServiceObject> _getDirect(String id) {
+    return vm.getAsMap(id).then((ObservableMap m) {
+        return _upgradeToServiceObject(vm, null, m);
+    });
+  }
+
+  Future<ServiceObject> get(String id) {
+    if (id.startsWith('isolates/')) {
+      String isolateId = _parseIsolateId(id);
+      if (isolateId == '') {
+        return reload();
+      } else {
+        Isolate isolate = _isolates.getIsolate(isolateId);
+        if (isolate == null) {
+          // TODO(turnidge): Isolate not found error.
+          return reload();
+        } else {
+          String objectId = _parseObjectId(id);
+          if (objectId == null) {
+            return isolate.reload();
+          } else {
+            return isolate.get(objectId);
+          }
+        }
+      }
+    } else if (id == 'vm') {
+      return reload();
+    } else {
+      return _getDirect(id);
+    }
+  }
+
+  /// Gets [id] as an [ObservableMap] from the service directly.
   Future<ObservableMap> getAsMap(String id) {
     return getString(id).then((response) {
       try {
         var map = JSON.decode(response);
         Logger.root.info('Decoded $id');
         return toObservable(map);
       } catch (e, st) {
         return toObservable({
           'type': 'Error',
           'id': '',
           'kind': 'DecodeError',
           'message': '$e',
         });
       }
     }).catchError((error) {
       return toObservable({
         'type': 'Error',
         'id': '',
         'kind': 'LastResort',
         'message': '$error'
       });
     });
   }
 
   /// Get [id] as a [String] from the service directly. See [getAsMap].
   Future<String> getString(String id);
+
+  void _update(ObservableMap map) {
+    print("$map");

[Cutch, 2014/03/20 18:25:56]

remove?

[turnidge, 2014/03/20 19:08:02]

Done.

+    _ref = false;
+    version = map['version'];
+    architecture = map['architecture'];
+    uptime = map['uptime'];
+    _isolates.updateIsolates(map['isolates']);
+  }
 }
 
 /// State for a running isolate.
 class Isolate extends ServiceObject {
-  final VM vm;
   String get link => _id;
   String get hashLink => '#/$_id';
 
+  @observable bool pausedOnStart = false;
+  @observable bool pausedOnExit = false;
+  @observable bool running = false;
+  @observable bool idle = false;
+
   ScriptCache _scripts;
   /// Script cache.
   ScriptCache get scripts => _scripts;
   CodeCache _codes;
   /// Code cache.
   CodeCache get codes => _codes;
   /// Class cache.
   ClassCache _classes;
   ClassCache get classes => _classes;
   /// Function cache.
   FunctionCache _functions;
   FunctionCache get functions => _functions;
 
   void _initOnce() {
     // Only called once.
-    assert(_isolate == null);
-    _isolate = this;
+    assert(_scripts == null);
     _scripts = new ScriptCache(this);
     _codes = new CodeCache(this);
     _classes = new ClassCache(this);
     _functions = new FunctionCache(this);
   }
 
-  Isolate.fromId(this.vm, String id) : super(null, id, '@Isolate') {
+  Isolate.fromId(VM vm, String id) : super(vm, id, '@Isolate') {
     _initOnce();
   }
 
-  Isolate.fromMap(this.vm, Map map) : super.fromMap(null, map) {
+  Isolate.fromMap(VM vm, Map map) : super.fromMap(vm, map) {
     _initOnce();
   }
 
   /// Creates a link to [id] relative to [this].
   @reflectable String relativeLink(String id) => '${this.id}/$id';
   /// Creates a relative link to [id] with a '#/' prefix.
   @reflectable String relativeHashLink(String id) => '#/${relativeLink(id)}';
 
   Future<ScriptCache> refreshCoverage() {
     return get('coverage').then(_scripts._processCoverage);
   }
 
   void processProfile(ServiceMap profile) {
     assert(profile.serviceType == 'Profile');
     var codeTable = new List<Code>();
     var codeRegions = profile['codes'];
     for (var codeRegion in codeRegions) {
       Code code = codeRegion['code'];
       assert(code != null);
       codeTable.add(code);
     }
     _codes._resetProfileData();
     _codes._updateProfileData(profile, codeTable);
     var exclusiveTrie = profile['exclusive_trie'];
     if (exclusiveTrie != null) {
       profileTrieRoot = _processProfileTrie(exclusiveTrie, codeTable);
     }
   }
 
-  Future<ServiceObject> getDirect(String serviceId) {
+  Future<ServiceObject> _getDirect(String serviceId) {
     return vm.getAsMap(relativeLink(serviceId)).then((ObservableMap m) {
         return _upgradeToServiceObject(vm, this, m);
     });
   }
 
   /// Requests [serviceId] from [this]. Completes to a [ServiceObject].
   /// Can return pre-existing, cached, [ServiceObject]s.
   Future<ServiceObject> get(String serviceId) {
     if (serviceId == '') {
       return reload();
     }
     if (_scripts.cachesId(serviceId)) {
       return _scripts.get(serviceId);
     }
     if (_codes.cachesId(serviceId)) {
       return _codes.get(serviceId);
     }
     if (_classes.cachesId(serviceId)) {
       return _classes.get(serviceId);
     }
     if (_functions.cachesId(serviceId)) {
       return _functions.get(serviceId);
     }
-    return getDirect(serviceId);
+    return _getDirect(serviceId);
   }
 
   @observable ServiceMap rootLib;
   @observable ObservableMap topFrame;
 
   @observable String name;
   @observable String vmName;
   @observable Map entry;
 
   @observable final Map<String, double> timers =
       toObservable(new Map<String, double>());
 
   @observable int newHeapUsed = 0;
   @observable int oldHeapUsed = 0;
   @observable int newHeapCapacity = 0;
   @observable int oldHeapCapacity = 0;
 
   @observable String fileAndLine;
 
   void _update(ObservableMap map) {
     upgradeCollection(map, vm, this);
+    mainPort = map['mainPort'];
+    name = map['name'];
+    if (ServiceObject.isRefType(map['type'])) {
+      return;
+    }
     _ref = false;
     if (map['rootLib'] == null ||
         map['timers'] == null ||
         map['heap'] == null) {
       Logger.root.severe("Malformed 'Isolate' response: $map");
       return;
     }
     rootLib = map['rootLib'];
     vmName = map['name'];
     if (map['entry'] != null) {
       entry = map['entry'];
-      name = entry['name'];
-    } else {
-      // fred
-      name = 'root';
     }
     if (map['topFrame'] != null) {
       topFrame = map['topFrame'];
     } else {
       topFrame = null ;
     }
 
     var timerMap = {};
     map['timers'].forEach((timer) {
         timerMap[timer['name']] = timer['time'];
       });
     timers['total'] = timerMap['time_total_runtime'];
     timers['compile'] = timerMap['time_compilation'];
     timers['gc'] = 0.0;  // TODO(turnidge): Export this from VM.
     timers['init'] = (timerMap['time_script_loading'] +
                       timerMap['time_creating_snapshot'] +
                       timerMap['time_isolate_initialization'] +
                       timerMap['time_bootstrap']);
     timers['dart'] = timerMap['time_dart_execution'];
 
     newHeapUsed = map['heap']['usedNew'];
     oldHeapUsed = map['heap']['usedOld'];
     newHeapCapacity = map['heap']['capacityNew'];
     oldHeapCapacity = map['heap']['capacityOld'];
+
+    // Isolate status
+    pausedOnStart = map['pausedOnStart'];
+    pausedOnExit = map['pausedOnExit'];
+    running = map['topFrame'] != null;
+    idle = !pausedOnStart && !pausedOnExit && !running;
   }
 
   @reflectable CodeTrieNode profileTrieRoot;
   // The profile trie is serialized as a list of integers. Each node
   // is recreated by consuming some portion of the list. The format is as
   // follows:
   // [0] index into codeTable of code object.
   // [1] tick count (number of times this stack frame occured).
   // [2] child node count
   // Reading the trie is done by recursively reading the tree depth-first
@@ skipping 29 matching lines @@
     for (var i = 0; i < children; i++) {
       var child = _readTrieNode(codeTable);
       node.children.add(child);
       node.summedChildCount += child.count;
     }
     return node;
   }
 }
 
 // TODO(johnmccutchan): Make this into an IsolateCache.
-class IsolateList extends ServiceObject {
+class IsolateList {
   final VM _vm;
-  VM get vm => _vm;
   @observable final isolates = new ObservableMap<String, Isolate>();
-  IsolateList(this._vm) : super(null, 'isolates', 'IsolateList') {
-    name = 'IsolateList';
-    vmName = name;
-  }
-  IsolateList.fromMap(this._vm, Map m) : super.fromMap(null, m) {
-    name = 'IsolateList';
-    vmName = name;
-  }
 
-  Future<ServiceObject> reload() {
-    return vm.getAsMap(id).then(update);
-  }
+  IsolateList(this._vm);
 
-  void _update(ObservableMap map) {
-    _updateIsolates(map['members']);
-  }
-
-  void _updateIsolates(List<Map> members) {
+  void updateIsolates(List<Map> members) {
      // Find dead isolates.
      var deadIsolates = [];
      isolates.forEach((k, v) {
        if (!_foundIsolateInMembers(k, members)) {
          deadIsolates.add(k);
        }
      });
      // Remove them.
      deadIsolates.forEach((id) {
        isolates.remove(id);
        Logger.root.info('Isolate \'$id\' has gone away.');
      });
 
      // Add new isolates.
      members.forEach((map) {
        var id = map['id'];
        var isolate = isolates[id];
        if (isolate == null) {
-         isolate = new Isolate.fromMap(vm, map);
+         isolate = new Isolate.fromMap(_vm, map);
          Logger.root.info('Created ServiceObject for \'${isolate.id}\' with '
                           'type \'${isolate.serviceType}\'');
          isolates[id] = isolate;
        }
      });
 
      // After updating the isolate list, refresh each isolate.
      _refreshIsolates();
    }
 
   void _refreshIsolates() {
     // This is technically asynchronous but we don't need to wait for
     // the result.
     isolates.forEach((k, Isolate isolate) {
       isolate.reload();
     });
   }
 
   Isolate getIsolate(String id) {
     assert(id.startsWith('isolates/'));
     var isolate = isolates[id];
     if (isolate != null) {
       return isolate;
     }
-    isolate = new Isolate.fromId(vm, id);
+    isolate = new Isolate.fromId(_vm, id);
     isolates[id] = isolate;
     isolate.load();
     return isolate;
   }
 
   Isolate getIsolateFromMap(ObservableMap m) {
     assert(ServiceObject.isServiceMap(m));
     String id = m['id'];
     assert(id.startsWith('isolates/'));
     var isolate = isolates[id];
     if (isolate != null) {
       isolate.update(m);
       return isolate;
     }
-    isolate = new Isolate.fromMap(vm, m);
+    isolate = new Isolate.fromMap(_vm, m);
     isolates[id] = isolate;
     isolate.load();
     return isolate;
   }
 
   static bool _foundIsolateInMembers(String id, List<Map> members) {
     return members.any((E) => E['id'] == id);
   }
 }
 
@@ skipping 44 matching lines @@
   void notifyChange(ChangeRecord record) => _map.notifyChange(record);
   notifyPropertyChange(Symbol field, Object oldValue, Object newValue) =>
       _map.notifyPropertyChange(field, oldValue, newValue);
   void observed() => _map.observed();
   void unobserved() => _map.unobserved();
   Stream<List<ChangeRecord>> get changes => _map.changes;
   bool get hasObservers => _map.hasObservers;
 }
 
 class ServiceError extends ServiceObject {
-  ServiceError.fromMap(Isolate isolate, Map m) : super.fromMap(isolate, m);
+  ServiceError.fromMap(ServiceObject owner, Map m) : super.fromMap(owner, m);
 
   @observable String kind;
   @observable String message;
 
   void _update(ObservableMap map) {
     kind = map['kind'];
     message = map['message'];
     name = 'ServiceError $kind';
     vmName = name;
   }
@@ skipping 336 matching lines @@
 
   int _callCount(List<CodeCallCount> calls, Code code) {
     for (CodeCallCount caller in calls) {
       if (caller.code == code) {
         return caller.count;
       }
     }
     return 0;
   }
 }