performance measurement improvements

pkg/analysis_server/test/performance/input_converter.dart

 // Copyright (c) 2015, 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 input.transformer;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ skipping 52 matching lines @@
    * to the target location of the source using during performance measurement.
    */
   final Map<String, String> srcPathMap;
 
   /**
    * The root directory for all source being modified
    * during performance measurement.
    */
   final String tmpSrcDirPath;
 
-  CommonInputConverter(this.tmpSrcDirPath, this.srcPathMap);
+  /**
+   * The diagnostic port for Analysis Server or `null` if none.
+   */
+  final int diagnosticPort;
+
+  CommonInputConverter(this.tmpSrcDirPath, this.srcPathMap,
+      {this.diagnosticPort});
 
   /**
    * Return an operation for the notification or `null` if none.
    */
   Operation convertNotification(Map<String, dynamic> json) {
     String event = json['event'];
     if (event == SERVER_STATUS) {
       // {"event":"server.status","params":{"analysis":{"isAnalyzing":false}}}
       Map<String, dynamic> params = json['params'];
       if (params != null) {
         Map<String, dynamic> analysis = params['analysis'];
         if (analysis != null && analysis['isAnalyzing'] == false) {
           return new WaitForAnalysisCompleteOperation();
         }
       }
     }
     if (event == SERVER_CONNECTED) {
       // {"event":"server.connected","params":{"version":"1.7.0"}}
-      return new StartServerOperation();
+      return new StartServerOperation(diagnosticPort: diagnosticPort);
     }
     if (eventsSeen.add(event)) {
       logger.log(Level.INFO, 'Ignored notification: $event\n  $json');
     }
     return null;
   }
 
   /**
    * Return an operation for the request or `null` if none.
    */
@@ skipping 174 matching lines @@
    */
   final Map<String, String> srcPathMap;
 
   /**
    * The root directory for all source being modified
    * during performance measurement.
    */
   final String tmpSrcDirPath;
 
   /**
+   * The diagnostic port for Analysis Server or `null` if none.
+   */
+  final int diagnosticPort;
+
+  /**
    * The number of lines read before the underlying converter was determined
    * or the end of file was reached.
    */
   int headerLineCount = 0;
 
   /**
    * The underlying converter used to translate lines into operations
    * or `null` if it has not yet been determined.
    */
   Converter<String, Operation> converter;
 
   /**
    * [active] is `true` if converting lines to operations
    * or `false` if an exception has occurred.
    */
   bool active = true;
 
-  InputConverter(this.tmpSrcDirPath, this.srcPathMap);
+  InputConverter(this.tmpSrcDirPath, this.srcPathMap, {this.diagnosticPort});
 
   @override
   Operation convert(String line) {
     if (!active) {
       return null;
     }
     if (converter != null) {
       try {
         return converter.convert(line);
       } catch (e) {
         active = false;
         rethrow;
       }
     }
     if (headerLineCount == 20) {
       throw 'Failed to determine input file format';
     }
     if (InstrumentationInputConverter.isFormat(line)) {
-      converter = new InstrumentationInputConverter(tmpSrcDirPath, srcPathMap);
+      converter = new InstrumentationInputConverter(tmpSrcDirPath, srcPathMap,
+          diagnosticPort: diagnosticPort);
     } else if (LogFileInputConverter.isFormat(line)) {
-      converter = new LogFileInputConverter(tmpSrcDirPath, srcPathMap);
+      converter = new LogFileInputConverter(tmpSrcDirPath, srcPathMap,
+          diagnosticPort: diagnosticPort);
     }
     if (converter != null) {
       return converter.convert(line);
     }
     logger.log(Level.INFO, 'skipped input line: $line');
     return null;
   }
 
   @override
   _InputSink startChunkedConversion(outSink) {
@@ skipping 13 matching lines @@
     if (op != null) {
       outSink.add(op);
     }
   }
 
   @override
   void close() {
     outSink.close();
   }
 }