Port metrics to RPC

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] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 1312 matching lines @@
     Map params = {
       'classId': cls.id,
       'limit': limit.toString(),
     };
     return invokeRpc('getInstances', params);
   }
 
   final ObservableMap<String, ServiceMetric> dartMetrics =
       new ObservableMap<String, ServiceMetric>();
 
-  final ObservableMap<String, ServiceMetric> vmMetrics =
+  final ObservableMap<String, ServiceMetric> nativeMetrics =
       new ObservableMap<String, ServiceMetric>();
 
   Future<ObservableMap<String, ServiceMetric>> _refreshMetrics(
-      String id,
+      String metricType,
       ObservableMap<String, ServiceMetric> metricsMap) {
-    return getDeprecated(id).then((result) {
+    return invokeRpc('getIsolateMetricList',
+                     { 'type': metricType }).then((result) {
       if (result is DartError) {
         // TODO(turnidge): Handle this more gracefully.
         Logger.root.severe(result.message);
         return null;
       }
       // Clear metrics map.
       metricsMap.clear();
       // Repopulate metrics map.
-      var members = result['members'];
-      for (var metric in members) {
+      var metrics = result['metrics'];
+      for (var metric in metrics) {
         metricsMap[metric.id] = metric;
       }
       return metricsMap;
     });
   }
 
   Future<ObservableMap<String, ServiceMetric>> refreshDartMetrics() {
-    return _refreshMetrics('metrics', dartMetrics);
+    return _refreshMetrics('Dart', dartMetrics);
   }
 
-  Future<ObservableMap<String, ServiceMetric>> refreshVMMetrics() {
-    return _refreshMetrics('metrics/vm', vmMetrics);
+  Future<ObservableMap<String, ServiceMetric>> refreshNativeMetrics() {
+    return _refreshMetrics('Native', nativeMetrics);
   }
 
   Future refreshMetrics() {
-    return refreshDartMetrics().then((_) => refreshVMMetrics());
+    return refreshDartMetrics().then((_) => refreshNativeMetrics());

[turnidge, 2015/02/04 21:24:24]

return Future.wait([refreshDartMetrics(), refreshNativeMetrics()]);

[Cutch, 2015/02/04 21:27:11]

Done.

   }
 
   String toString() => "Isolate($_id)";
 }
 
 /// A [ServiceObject] which implements [ObservableMap].
 class ServiceMap extends ServiceObject implements ObservableMap {
   final ObservableMap _map = new ObservableMap();
   static String objectIdRingPrefix = 'objects/';
 
@@ skipping 1413 matching lines @@
     localAddress = map['localAddress'];
     localPort = map['localPort'];
     remoteAddress = map['remoteAddress'];
     remotePort = map['remotePort'];
 
     fd = map['fd'];
     socketOwner = map['owner'];
   }
 }
 
+

[turnidge, 2015/02/04 21:24:24]

Too many blank lines?

[Cutch, 2015/02/04 21:27:11]

Done.

+
 class MetricSample {
   final double value;
   final DateTime time;
   MetricSample(this.value) : time = new DateTime.now();
 }
 
 class ServiceMetric extends ServiceObject {
   ServiceMetric._empty(ServiceObjectOwner owner) : super._empty(owner) {
   }
 
   bool get canCache => true;
   bool get immutable => false;
 
   @observable bool recording = false;
   MetricPoller poller;
 
   final ObservableList<MetricSample> samples =
       new ObservableList<MetricSample>();
   int _sampleBufferSize = 100;
   int get sampleBufferSize => _sampleBufferSize;
   set sampleBufferSize(int size) {
     _sampleBufferSize = size;
     _removeOld();
   }
 
   Future<ObservableMap> _fetchDirect() {
-    // TODO(johnmmccutchan): Make this use json rpc.
-    return vm._getAsMapDeprecated(link);
+    assert(owner is Isolate);
+    return isolate.invokeRpcNoUpgrade('getIsolateMetric', { 'metricId': id});

[turnidge, 2015/02/04 21:24:24]

Add extra space after 'id' in id} to be consistent.

[Cutch, 2015/02/04 21:27:11]

Done.

   }
 
 
   void addSample(MetricSample sample) {
     samples.add(sample);
     _removeOld();
   }
 
   void _removeOld() {
     // TODO(johnmccutchan): If this becomes hot, consider using a circular
@@ skipping 104 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);
     }
   }
 }