Miscellaneous Observatory UI improvements

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 95 matching lines @@
   Future<ServiceObject> reload() {
     if (id == '') {
       // Errors don't have ids.
       assert(serviceType == 'Error');
       return new Future.value(this);
     }
     if (loaded && immutable) {
       return new Future.value(this);
     }
     if (_inProgressReload == null) {
-      _inProgressReload =  vm.getAsMap(link).then((ObservableMap map) {
+      _inProgressReload = vm.getAsMap(link).then((ObservableMap map) {
           var mapType = _stripRef(map['type']);
           if (mapType != _serviceType) {
             // If the type changes, return a new object instead of
             // updating the existing one.
             assert(mapType == 'Error' || mapType == 'Null');
             return new ServiceObject._fromMap(owner, map);
           }
           update(map);
           return this;
       }).whenComplete(() {
@@ skipping 103 matching lines @@
     return reload().then((result) {
         if (result is! VM) {
           return null;
         }
         assert(result == this);
         return _isolateCache[isolateId];
       });
   }
 
   Future<ServiceObject> get(String id) {
+    var parts = id.split('#');
+    assert(parts.length >= 1);
+    // We should never see more than two hashes.
+    assert(parts.length <= 2);
+    // The ID does not include anything after the # (or the # itself).
+    id = parts[0];
+    // I'm serious.
+    assert(!id.contains('#'));
     // Isolates are handled specially, since they can cache sub-objects.
     if (id.startsWith(_isolatesPrefix)) {
       String isolateId = _parseIsolateId(id);
       String objectId = _parseObjectId(id);
       return _getIsolate(isolateId).then((isolate) {
           if (isolate == null) {
             // The isolate does not exist.  Return the VM object instead.
             //
             // TODO(turnidge): Generate a service error?
             return this;
@@ skipping 187 matching lines @@
     if (snapshots.length > _historySize) {
       snapshots.removeAt(0);
     }
   }
 }
 
 /// State for a running isolate.
 class Isolate extends ServiceObjectOwner {
   @reflectable VM get vm => owner;
   @reflectable Isolate get isolate => this;
+  @observable ObservableMap counters = toObservable(new ObservableMap());
 
   String get link => _id;
   String get hashLink => '#/$_id';
 
   @observable bool pausedOnStart = false;
   @observable bool pausedOnExit = false;
   @observable bool running = false;
   @observable bool idle = false;
 
   Map<String,ServiceObject> _cache = new Map<String,ServiceObject>();
@@ skipping 61 matching lines @@
     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']);
   }
 
   ServiceObject getFromMap(ObservableMap map) {
     if (map == null) {
       return null;
     }
     String id = map['id'];
     var obj = _cache[id];
     if (obj != null) {
@@ skipping 62 matching lines @@
     rootLib = map['rootLib'];
     if (map['entry'] != null) {
       entry = map['entry'];
     }
     if (map['topFrame'] != null) {
       topFrame = map['topFrame'];
     } else {
       topFrame = null ;
     }
 
+    var countersMap = map['tagCounters'];
+    if (countersMap != null) {
+      var names = countersMap['names'];
+      var counts = countersMap['counters'];
+      assert(names.length == counts.length);
+      var sum = 0;
+      for (var i = 0; i < counts.length; i++) {
+        sum += counts[i];
+      }
+      // TODO: Why does this not work without this?
+      counters = toObservable({});
+      if (sum == 0) {
+        for (var i = 0; i < names.length; i++) {
+          counters[names[i]] = '0.0%';
+        }
+      } else {
+        for (var i = 0; i < names.length; i++) {
+          counters[names[i]] =
+              (counts[i] / sum * 100.0).toStringAsFixed(2) + '%';
+        }
+      }
+    }
     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'] +
@@ skipping 191 matching lines @@
   @reflectable final int line;
   @reflectable final String text;
   ScriptLine(this.line, this.text);
 }
 
 class Script extends ServiceObject {
   @reflectable final lines = new ObservableList<ScriptLine>();
   @reflectable final hits = new ObservableMap<int, int>();
   @observable ServiceObject library;
   @observable String kind;
-
+  @observable int firstTokenPos;
+  @observable int lastTokenPos;
   bool get canCache => true;
   bool get immutable => true;
 
   String _shortUrl;
   String _url;
 
   Script._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   /// This function maps a token position to a line number.
   int tokenToLine(int token) => _tokenToLine[token];
@@ skipping 12 matching lines @@
     _processSource(map['source']);
     _parseTokenPosTable(map['tokenPosTable']);
   }
 
   void _parseTokenPosTable(List<List<int>> table) {
     if (table == null) {
       return;
     }
     _tokenToLine = {};
     _tokenToCol = {};
+    firstTokenPos = null;
+    lastTokenPos = null;
     for (var line in table) {
       // Each entry begins with a line number...
       var lineNumber = line[0];
       for (var pos = 1; pos < line.length; pos += 2) {
         // ...and is followed by (token offset, col number) pairs.
         var tokenOffset = line[pos];
         var colNumber = line[pos+1];
+        if (firstTokenPos == null) {
+          // Mark first token position.
+          firstTokenPos = tokenOffset;
+          lastTokenPos = tokenOffset;
+        } else {
+          // Keep track of max and min token positions.
+          firstTokenPos = (firstTokenPos <= tokenOffset) ?
+              firstTokenPos : tokenOffset;
+          lastTokenPos = (lastTokenPos >= tokenOffset) ?
+              lastTokenPos : tokenOffset;
+        }
         _tokenToLine[tokenOffset] = lineNumber;
         _tokenToCol[tokenOffset] = colNumber;
       }
     }
   }
 
   void _processHits(List scriptHits) {
-    if (!_loaded) {
-      // Eagerly grab script source.
-      load();
-    }
     // Update hits table.
     for (var i = 0; i < scriptHits.length; i += 2) {
       var line = scriptHits[i];
       var hit = scriptHits[i + 1]; // hit status.
       assert(line >= 1); // Lines start at 1.
       hits[line] = hit;
     }
   }
 
   void _processSource(String source) {
     // Preemptyively mark that this is not loaded.
     _loaded = false;
     if (source == null) {
       return;
     }
     var sourceLines = source.split('\n');
     if (sourceLines.length == 0) {
       return;
     }
     // We have the source to the script. This is now loaded.
     _loaded = true;
     lines.clear();
     Logger.root.info('Adding ${sourceLines.length} source lines for ${_url}');
     for (var i = 0; i < sourceLines.length; i++) {
       lines.add(new ScriptLine(i + 1, sourceLines[i]));
     }
   }
-
-
 }
 
 class CodeTick {
   final int address;
   final int exclusiveTicks;
   final int inclusiveTicks;
   CodeTick(this.address, this.exclusiveTicks, this.inclusiveTicks);
 }
 
 
@@ skipping 248 matching lines @@
   }
 
   int _callCount(List<CodeCallCount> calls, Code code) {
     for (CodeCallCount caller in calls) {
       if (caller.code == code) {
         return caller.count;
       }
     }
     return 0;
   }
+
+  @reflectable bool get isDartCode => kind == CodeKind.Dart;
 }
 
 // Returns true if [map] is a service map. i.e. it has the following keys:
 // 'id' and a 'type'.
 bool _isServiceMap(ObservableMap m) {
   return (m != null) && (m['id'] != null) && (m['type'] != null);
 }
 
 bool _hasRef(String type) => type.startsWith('@');
 String _stripRef(String type) => (_hasRef(type) ? type.substring(1) : type);
@@ skipping 29 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);
     }
   }
 }