Display ICData entries at call sites, with links to the targets and guarded classes.

runtime/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] represents a persistent object within the vm.
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
     return o1.name.compareTo(o2.name);
@@ skipping 275 matching lines @@
   _ignoreError(error, stackTrace) {
     // do nothing.
   }
 }
 
 abstract class Coverage {
   // Following getters and functions will be provided by [ServiceObject].
   String get id;
   Isolate get isolate;
 
+  Future refreshCoverage() {
+    return refreshCallSiteData();
+  }
+
   /// Default handler for coverage data.
-  void processCoverageData(List coverageData) {
+  void processCallSiteData(List coverageData) {
     coverageData.forEach((scriptCoverage) {
       assert(scriptCoverage['script'] != null);
-      scriptCoverage['script']._processHits(scriptCoverage['hits']);
+      scriptCoverage['script']._processCallSites(scriptCoverage['callSites']);
     });
   }
 
-  Future refreshCoverage() {
+  Future refreshCallSiteData() {
     Map params = {};
     if (this is! Isolate) {
       params['targetId'] = id;
     }
-    return isolate.invokeRpcNoUpgrade('getCoverage', params).then(
+    return isolate.invokeRpcNoUpgrade('getCallSiteData', params).then(
         (ObservableMap map) {
           var coverage = new ServiceObject._fromMap(isolate, map);
           assert(coverage.type == 'CodeCoverage');
           var coverageList = coverage['coverage'];
           assert(coverageList != null);
-          processCoverageData(coverageList);
+          processCallSiteData(coverageList);
           return this;
         });
   }
 }
 
 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].
@@ skipping 1617 matching lines @@
     script = map['script'];
     tokenPos = map['tokenPos'];
     endTokenPos = map['endTokenPos'];
     code = _convertNull(map['code']);
     unoptimizedCode = _convertNull(map['unoptimizedCode']);
     isOptimizable = map['optimizable'];
     isInlinable = map['inlinable'];
     deoptimizations = map['deoptimizations'];
     usageCounter = map['usageCounter'];
   }
-
-  // TODO(rmacnak): Generalize and move to Coverage.
-  void processCallSiteData(List callSiteMaps) {
-    var callSites = new List();
-    for (var callSiteMap in callSiteMaps) {
-      callSites.add(new CallSite.fromMap(callSiteMap, script));
-    }
-    script._processCallSites(callSites);
-  }
-
-  Future refreshCallSiteData() {
-    Map params = {};
-    if (this is! Isolate) {
-      params['targetId'] = id;
-    }
-    return isolate.invokeRpcNoUpgrade('getCallSiteData', params).then(
-        (ObservableMap map) {
-          var data = new ServiceObject._fromMap(isolate, map);
-          assert(data.type == '_CallSiteData');
-          var callSites = data['callSites'];
-          assert(callSites != null);
-          processCallSiteData(callSites);
-          return this;
-        });
-  }
 }
 
 
 class Field extends ServiceObject {
   @observable var /* Library or Class */ owner;
   @observable Instance declaredType;
   @observable bool isStatic;
   @observable bool isFinal;
   @observable bool isConst;
   @observable Instance value;
@@ skipping 114 matching lines @@
   final String name;
   final Script script;
   final int tokenPos;
   final List<CallSiteEntry> entries;
 
   CallSite(this.name, this.script, this.tokenPos, this.entries);
 
   int get line => script.tokenToLine(tokenPos);
   int get column => script.tokenToCol(tokenPos);
 
+  int get aggregateCount {
+    var count = 0;
+    for (var entry in entries) {
+      count += entry.count;
+    }
+    return count;
+  }
 
   factory CallSite.fromMap(Map siteMap, Script script) {
     var name = siteMap['name'];
     var tokenPos = siteMap['tokenPos'];
     var entries = new List<CallSiteEntry>();
     for (var entryMap in siteMap['cacheEntries']) {
       entries.add(new CallSiteEntry.fromMap(entryMap));
     }
     return new CallSite(name, script, tokenPos, entries);
   }
 
   operator ==(other) {
     return (script == other.script) && (tokenPos == other.tokenPos);
   }
   int get hashCode => (script.hashCode << 8) | tokenPos;
 
   String toString() => "CallSite($name, $tokenPos)";
 }
 
 class CallSiteEntry {
   final /* Class | Library */ receiverContainer;
   final int count;
+  final ServiceFunction target;
 
-  CallSiteEntry(this.receiverContainer, this.count);
+  CallSiteEntry(this.receiverContainer, this.count, this.target);
 
   factory CallSiteEntry.fromMap(Map entryMap) {
     return new CallSiteEntry(entryMap['receiverContainer'],
-                             entryMap['count']);
+                             entryMap['count'],
+                             entryMap['target']);
   }
 
   String toString() => "CallSiteEntry(${receiverContainer.name}, $count)";
 }
 
 class Script extends ServiceObject with Coverage {
   Set<CallSite> callSites = new Set<CallSite>();
   final lines = new ObservableList<ScriptLine>();
   final _hits = new Map<int, int>();
   @observable String kind;
@@ skipping 71 matching lines @@
     }
 
     for (var line in lines) {
       // Remove possible breakpoints on lines with no tokens.
       if (!lineSet.contains(line.line)) {
         line.possibleBpt = false;
       }
     }
   }
 
-  void _processCallSites(List newCallSites) {
-    var mergedCallSites = new Set();
-    mergedCallSites.addAll(newCallSites);
-    mergedCallSites.addAll(callSites);
-    callSites = mergedCallSites;
-    // Notify any Observers that this Script's state has changed.
-    notifyChange(null);
-  }
+  void _processCallSites(List newCallSiteMaps) {
+    var mergedCallSites = new Set<CallSite>();
+    for (var callSiteMap in newCallSiteMaps) {
+      var newSite = new CallSite.fromMap(callSiteMap, this);
+      mergedCallSites.add(newSite);
 
-  void _processHits(List scriptHits) {
-    // Update hits table.
-    for (var i = 0; i < scriptHits.length; i += 2) {
-      var line = scriptHits[i];
-      var hit = scriptHits[i + 1]; // hit status.
+      var line = newSite.line;
+      var hit = newSite.aggregateCount;
       assert(line >= 1); // Lines start at 1.
       var oldHits = _hits[line];
       if (oldHits != null) {
         hit += oldHits;
       }
       _hits[line] = hit;
     }
+
+    mergedCallSites.addAll(callSites);
+    callSites = mergedCallSites;
     _applyHitsToLines();
     // Notify any Observers that this Script's state has changed.
     notifyChange(null);
   }
 
   void _processSource(String source) {
     // Preemptyively mark that this is not loaded.
     _loaded = false;
     if (source == null) {
       return;
@@ skipping 714 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);
     }
   }
 }