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 310 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 143 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;

[turnidge, 2014/04/01 19:42:48]

I see where these are initialized, but I missed where they get used.

[Cutch, 2014/04/02 18:26:52]

Now that <script-view> uses <script-inset> we pass these bounds to
<script-inset> an alternative would be to pass -1 or some other sentinel value.

 
   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.
@@ skipping 13 matching lines @@
     _processSource(map['source']);
     _parseTokenPosTable(map['tokenPosTable']);
   }
 
   void _parseTokenPosTable(List<List<int>> table) {
     if (table == null) {
       return;
     }
     _tokenToLine = {};
     _tokenToCol = {};
+    firstTokenPos = 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.

[turnidge, 2014/04/01 19:42:48]

This assumes that the line number table is provided in sorted order by lines. 
It also assumes that tokens within a line are sorted by column.

Safer would be to keep track of highest and lowest seen by (row,col) or perhaps
simpler might be to keep track of the lowest and highest tokenPos, which assumes
tokens are generated in monotonic order as we parse the program.
 
Not sure I want you to change this, just pointing this out.  Maybe a
comment/todo?

[Cutch, 2014/04/02 18:26:52]

I've modified the code to track the minimum and maximum token positions. 

+          firstTokenPos = tokenOffset;
+        }
+        lastTokenPos = tokenOffset;
         _tokenToLine[tokenOffset] = lineNumber;
         _tokenToCol[tokenOffset] = colNumber;
       }
     }
   }
 
   void _processHits(List scriptHits) {
     if (!_loaded) {
       // Eagerly grab script source.
       load();
@@ skipping 337 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);
     }
   }
 }