Rework analysis server performance measurement code.

pkg/analyzer/lib/src/analyzer_impl.dart

 // Copyright (c) 2013, 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.
 
 library analyzer_impl;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:io';
 
 import 'package:analyzer/file_system/file_system.dart' show Folder;
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/source/package_map_provider.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/src/error_formatter.dart';
 import 'package:analyzer/src/generated/java_core.dart' show JavaSystem;
 import 'package:analyzer/src/generated/java_engine.dart';
 
 import '../options.dart';
 import 'generated/constant.dart';
 import 'generated/element.dart';
 import 'generated/engine.dart';
 import 'generated/error.dart';
 import 'generated/java_io.dart';
 import 'generated/sdk_io.dart';
 import 'generated/source_io.dart';
+import 'package:analyzer/src/generated/utilities_general.dart';
 
 DirectoryBasedDartSdk sdk;
 
 /**
  * The maximum number of sources for which AST structures should be kept in the cache.
  */
 const int _MAX_CACHE_SIZE = 512;
 
 /// Analyzes single library [File].
 class AnalyzerImpl {
@@ skipping 254 matching lines @@
         ErrorSeverity.INFO &&
         options.disableHints) {
       return false;
     }
     return true;
   }
 
   _printColdPerf() {
     // print cold VM performance numbers
     int totalTime = JavaSystem.currentTimeMillis() - startTime;
-    int ioTime = PerformanceStatistics.io.result;
-    int scanTime = PerformanceStatistics.scan.result;
-    int parseTime = PerformanceStatistics.parse.result;
-    int resolveTime = PerformanceStatistics.resolve.result;
-    int errorsTime = PerformanceStatistics.errors.result;
-    int hintsTime = PerformanceStatistics.hints.result;
-    stdout.writeln("io-cold:$ioTime");
-    stdout.writeln("scan-cold:$scanTime");
-    stdout.writeln("parse-cold:$parseTime");
-    stdout.writeln("resolve-cold:$resolveTime");
-    stdout.writeln("errors-cold:$errorsTime");
-    stdout.writeln("hints-cold:$hintsTime");
-    stdout.writeln("other-cold:${totalTime
-        - (ioTime + scanTime + parseTime + resolveTime + errorsTime + hintsTime)}");
+    int otherTime = totalTime;
+    for (PerformanceTag tag in PerformanceTag.all) {
+      if (tag != PerformanceTag.UNKNOWN) {
+        int tagTime = tag.elapsedMs;
+        stdout.writeln('${tag.label}-cold:$tagTime');
+        otherTime -= tagTime;
+      }
+    }
+    stdout.writeln('other-cold:$otherTime');
     stdout.writeln("total-cold:$totalTime");
   }
 
   _printErrorsAndPerf() {
     // The following is a hack. We currently print out to stderr to ensure that
     // when in batch mode we print to stderr, this is because the prints from
     // batch are made to stderr. The reason that options.shouldBatch isn't used
     // is because when the argument flags are constructed in BatchRunner and
     // passed in from batch mode which removes the batch flag to prevent the
     // "cannot have the batch flag and source file" error message.
     IOSink sink = options.machineFormat ? stderr : stdout;
 
     // print errors
     ErrorFormatter formatter =
         new ErrorFormatter(sink, options, _isDesiredError);
     formatter.formatErrors(errorInfos);
 
     // print performance numbers
     if (options.perf || options.warmPerf) {
       int totalTime = JavaSystem.currentTimeMillis() - startTime;
-      int ioTime = PerformanceStatistics.io.result;
-      int scanTime = PerformanceStatistics.scan.result;
-      int parseTime = PerformanceStatistics.parse.result;
-      int resolveTime = PerformanceStatistics.resolve.result;
-      int errorsTime = PerformanceStatistics.errors.result;
-      int hintsTime = PerformanceStatistics.hints.result;
-      stdout.writeln("io:$ioTime");
-      stdout.writeln("scan:$scanTime");
-      stdout.writeln("parse:$parseTime");
-      stdout.writeln("resolve:$resolveTime");
-      stdout.writeln("errors:$errorsTime");
-      stdout.writeln("hints:$hintsTime");
-      stdout.writeln("other:${totalTime
-          - (ioTime + scanTime + parseTime + resolveTime + errorsTime + hintsTime)}");
+      int otherTime = totalTime;
+      for (PerformanceTag tag in PerformanceTag.all) {
+        if (tag != PerformanceTag.UNKNOWN) {
+          int tagTime = tag.elapsedMs;
+          stdout.writeln('${tag.label}:$tagTime');
+          otherTime -= tagTime;
+        }
+      }
+      stdout.writeln('other:$otherTime');
       stdout.writeln("total:$totalTime");
     }
   }
 
   /**
    * Compute the severity of the error; however, if
    * [enableTypeChecks] is false, then de-escalate checked-mode compile time
    * errors to a severity of [ErrorSeverity.INFO].
    */
   static ErrorSeverity computeSeverity(AnalysisError error,
@@ skipping 79 matching lines @@
     }
   }
 
   @override
   void logInformation2(String message, Object exception) {
     if (log) {
       stdout.writeln(message);
     }
   }
 }