performance measurement improvements

pkg/analysis_server/test/performance/operation.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 server.operation;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:logging/logging.dart';
 
 import 'driver.dart';
 import 'input_converter.dart';
 
 /**
- * A [CompletionRequestOperation] tracks response time along with 
+ * A [CompletionRequestOperation] tracks response time along with
  * the first and last completion notifications.
  */
 class CompletionRequestOperation extends RequestOperation {
   Driver driver;
   StreamSubscription<CompletionResultsParams> subscription;
   String notificationId;
   Stopwatch stopwatch;
   bool firstNotification = true;
 
   CompletionRequestOperation(
@@ skipping 46 matching lines @@
   final CommonInputConverter converter;
   final Map<String, dynamic> json;
 
   RequestOperation(this.converter, this.json);
 
   @override
   Future perform(Driver driver) {
     Stopwatch stopwatch = new Stopwatch();
     String originalId = json['id'];
     String method = json['method'];
+    json['clientRequestTime'] = new DateTime.now().millisecondsSinceEpoch;
     driver.logger.log(Level.FINE, 'Sending request: $method\n  $json');
     stopwatch.start();
 
     void recordResult(bool success, result) {
       Duration elapsed = stopwatch.elapsed;
       driver.results.record(method, elapsed, success: success);
       driver.logger.log(
           Level.FINE, 'Response received: $method : $elapsed\n  $result');
     }
 
@@ skipping 78 matching lines @@
       if (expectedError == null) {
         converter.logger.log(Level.SEVERE, message);
       } else {
         throw message;
       }
     }
   }
 }
 
 class StartServerOperation extends Operation {
+  final int diagnosticPort;
+
+  StartServerOperation({this.diagnosticPort});
+
   @override
   Future perform(Driver driver) {
-    return driver.startServer();
+    return driver.startServer(diagnosticPort: diagnosticPort);
   }
 }
 
 class WaitForAnalysisCompleteOperation extends Operation {
   @override
   Future perform(Driver driver) {
     DateTime start = new DateTime.now();
     driver.logger.log(Level.FINE, 'waiting for analysis to complete');
     StreamSubscription<ServerStatusParams> subscription;
     Timer timer;
     Completer completer = new Completer();
     bool isAnalyzing = false;
     subscription = driver.onServerStatus.listen((ServerStatusParams params) {
-      // TODO (danrubel) ensure that server.setSubscriptions STATUS is set
       if (params.analysis != null) {
         if (params.analysis.isAnalyzing) {
           isAnalyzing = true;
         } else {
           subscription.cancel();
           timer.cancel();
           DateTime end = new DateTime.now();
           Duration delta = end.difference(start);
           driver.logger.log(Level.FINE, 'analysis complete after $delta');
           completer.complete();
           driver.results.record('analysis complete', delta, notification: true);
         }
       }
     });
     timer = new Timer.periodic(new Duration(milliseconds: 20), (_) {
       if (!isAnalyzing) {
         // TODO (danrubel) revisit this once source change requests are implemented
         subscription.cancel();
         timer.cancel();
         driver.logger.log(Level.INFO, 'analysis never started');
         completer.complete();
         return;
       }
-      // Timeout if no communcation received within the last 10 seconds.
+      // Timeout if no communcation received within the last 60 seconds.
       double currentTime = driver.server.currentElapseTime;
       double lastTime = driver.server.lastCommunicationTime;
-      if (currentTime - lastTime > 10) {
+      if (currentTime - lastTime > 60) {
         subscription.cancel();
         timer.cancel();
         String message = 'gave up waiting for analysis to complete';
         driver.logger.log(Level.WARNING, message);
         completer.completeError(message);
       }
     });
     return completer.future;
   }
 }