Fix an issue calculating analysis server cpu usage.

BUG= R=brianwilkerson@google.com Review-Url: https://codereview.chromium.org/2959643002 .
dart-lang · Jun 26, 2017 · de5cf42 · de5cf42
1 parent b192ecf
commit de5cf42
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/pkg/analysis_server/lib/src/utilities/profiling.dart b/pkg/analysis_server/lib/src/utilities/profiling.dart
@@ -32,15 +32,19 @@ class UsageInfo {
   /// never more than slightly above 100.0).
   final double cpuPercentage;
 
-  /// The process memory usage in bytes.
+  /// The process memory usage in kilobytes.
   final int memoryKB;
 
   UsageInfo(this.cpuPercentage, this.memoryKB);
 
   double get memoryMB => memoryKB / 1024;
+
+  String toString() => '$cpuPercentage% ${memoryMB.toStringAsFixed(1)}MB';
 }
 
 class _PosixProcessProfiler extends ProcessProfiler {
+  static final RegExp stringSplitRegExp = new RegExp(r'\s+');
+
   _PosixProcessProfiler() : super._();
 
   @override
@@ -76,7 +80,7 @@ class _PosixProcessProfiler extends ProcessProfiler {
     try {
       // "  0.0 378940"
       String line = psResults.split('\n').first.trim();
-      List<String> values = line.split(' ');
+      List<String> values = line.split(stringSplitRegExp);
       return new UsageInfo(double.parse(values[0]), int.parse(values[1]));
     } catch (e) {
       return null;

diff --git a/pkg/analysis_server/test/src/utilities/profiling_test.dart b/pkg/analysis_server/test/src/utilities/profiling_test.dart
@@ -18,14 +18,13 @@ main() {
       expect(ProcessProfiler.getProfilerForPlatform(), isNotNull);
     });
 
-    // TODO: https://github.com/dart-lang/sdk/issues/29815
-//    test('getProcessUsage', () async {
-//      ProcessProfiler profiler = ProcessProfiler.getProfilerForPlatform();
-//      UsageInfo info = await profiler.getProcessUsage(pid);
-//
-//      expect(info, isNotNull);
-//      expect(info.cpuPercentage, greaterThanOrEqualTo(0.0));
-//      expect(info.memoryKB, greaterThanOrEqualTo(0));
-//    });
+    test('getProcessUsage', () async {
+      ProcessProfiler profiler = ProcessProfiler.getProfilerForPlatform();
+      UsageInfo info = await profiler.getProcessUsage(pid);
+
+      expect(info, isNotNull);
+      expect(info.cpuPercentage, greaterThanOrEqualTo(0.0));
+      expect(info.memoryKB, greaterThanOrEqualTo(0));
+    });
   });
 }