Observatory requests coverage per script

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 {
   /// The owner of this [ServiceObject].  This can be an [Isolate], a
@@ skipping 142 matching lines @@
       assert(!canCache);
     }
     _id = map['id'];
 
     _serviceType = mapType;
     _update(map, mapIsRef);
   }
 
   // Updates internal state from [map]. [map] can be a reference.
   void _update(ObservableMap map, bool mapIsRef);
+
+  String relativeLink(String id) {
+    assert(id != null);
+    return "${link}/${id}";
+  }
+}
+
+abstract class Coverage {
+  // Following getters and functions will be provided by [ServiceObject].
+  ServiceObjectOwner get owner;
+  String get serviceType;
+  VM get vm;
+  String relativeLink(String id);
+
+  /// Default handler for coverage data.
+  void processCoverageData(List coverageData) {
+    coverageData.forEach((scriptCoverage) {
+      assert(scriptCoverage['script'] != null);
+      scriptCoverage['script']._processHits(scriptCoverage['hits']);
+    });
+  }
+
+  Future refreshCoverage() {
+    return vm.getAsMap(relativeLink('coverage')).then((ObservableMap map) {
+      var coverageOwner = (serviceType == 'Isolate') ? this : owner;
+      var coverage = new ServiceObject._fromMap(coverageOwner, map);
+      assert(coverage.serviceType == 'CodeCoverage');
+      var coverageList = coverage['coverage'];
+      assert(coverageList != null);
+      processCoverageData(coverageList);
+    });
+  }
 }
 
 abstract class ServiceObjectOwner extends ServiceObject {
   /// Creates an empty [ServiceObjectOwner].
   ServiceObjectOwner._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   /// Builds a [ServiceObject] corresponding to the [id] from [map].
   /// The result may come from the cache.  The result will not necessarily
   /// be [loaded].
   ServiceObject getFromMap(ObservableMap map);
@@ skipping 328 matching lines @@
     used = heapMap['used'];
     capacity = heapMap['capacity'];
     external = heapMap['external'];
     collections = heapMap['collections'];
     totalCollectionTimeInSeconds = heapMap['time'];
     averageCollectionPeriodInMillis = heapMap['avgCollectionPeriodMillis'];
   }
 }
 
 /// State for a running isolate.
-class Isolate extends ServiceObjectOwner {
+class Isolate extends ServiceObjectOwner with Coverage {
   @reflectable VM get vm => owner;
   @reflectable Isolate get isolate => this;
   @observable ObservableMap counters = new ObservableMap();
 
   String get link => '/${_id}';
 
   @observable ServiceMap pauseEvent = null;
   bool get _isPaused => pauseEvent != null;
 
   @observable bool running = false;
@@ skipping 47 matching lines @@
 
   void _updateProfileData(ServiceMap profile, List<Code> codeTable) {
     var codeRegions = profile['codes'];
     var sampleCount = profile['samples'];
     for (var codeRegion in codeRegions) {
       Code code = codeRegion['code'];
       code.updateProfileData(codeRegion, codeTable, sampleCount);
     }
   }
 
-  Future refreshCoverage() {
-    return get('coverage').then(_processCoverage);
-  }
-
-  void _processCoverage(ServiceMap coverage) {
-    assert(coverage.serviceType == 'CodeCoverage');
-    var coverageList = coverage['coverage'];
-    assert(coverageList != null);
-    coverageList.forEach((scriptCoverage) {
-      _processScriptCoverage(scriptCoverage);
-    });
-  }
-
-  void _processScriptCoverage(ObservableMap scriptCoverage) {
-    // Because the coverage data was upgraded into a ServiceObject,
-    // the script can be directly accessed.
-    Script script = scriptCoverage['script'];
-    assert(_cache.containsValue(script));
-    script._processHits(scriptCoverage['hits']);
-  }
-
   /// Fetches and builds the class hierarchy for this isolate. Returns the
   /// Object class object.
   Future<Class> getClassHierarchy() {
     return get('classes').then(_loadClasses).then(_buildClassHierarchy);
   }
 
   /// Given the class list, loads each class.
   Future<List<Class>> _loadClasses(ServiceMap classList) {
     assert(classList.serviceType == 'ClassList');
     var futureClasses = [];
@@ skipping 335 matching lines @@
 
   void _update(ObservableMap map, bool mapIsRef) {
     kind = map['kind'];
     message = map['message'];
     response = map['response'];
     name = 'ServiceException $kind';
     vmName = name;
   }
 }
 
-class Library extends ServiceObject {
+class Library extends ServiceObject with Coverage {
   @observable String url;
   @reflectable final imports = new ObservableList<Library>();
   @reflectable final scripts = new ObservableList<Script>();
   @reflectable final classes = new ObservableList<Class>();
   @reflectable final variables = new ObservableList<ServiceMap>();
   @reflectable final functions = new ObservableList<ServiceMap>();
 
   bool get canCache => true;
   bool get immutable => false;
 
@@ skipping 58 matching lines @@
   void update(List stats) {
     accumulated.instances = stats[ACCUMULATED];
     accumulated.bytes = stats[ACCUMULATED_SIZE];
     current.instances = stats[LIVE_AFTER_GC] + stats[ALLOCATED_SINCE_GC];
     current.bytes = stats[LIVE_AFTER_GC_SIZE] + stats[ALLOCATED_SINCE_GC_SIZE];
   }
 
   bool get empty => accumulated.empty && current.empty;
 }
 
-class Class extends ServiceObject {
+class Class extends ServiceObject with Coverage {
   @observable Library library;
   @observable Script script;
   @observable Class superClass;
 
   @observable bool isAbstract;
   @observable bool isConst;
   @observable bool isFinalized;
   @observable bool isPatch;
   @observable bool isImplemented;
 
@@ skipping 86 matching lines @@
   }
 }
 
 class ScriptLine extends Observable {
   final int line;
   final String text;
   @observable int hits;
   ScriptLine(this.line, this.text);
 }
 
-class Script extends ServiceObject {
+class Script extends ServiceObject with Coverage {
   final lines = new ObservableList<ScriptLine>();
   final _hits = new Map<int, int>();
   @observable String kind;
   @observable int firstTokenPos;
   @observable int lastTokenPos;
   bool get canCache => true;
   bool get immutable => true;
 
   String _shortUrl;
   String _url;
@@ skipping 677 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);
     }
   }
 }