Another tweak for displaying performance.

pkg/analysis_server/lib/src/get_handler.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.
 
 library analysis_server.src.get_handler;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
@@ skipping 244 matching lines @@
    */
   void _returnAnalysisPerformance(HttpRequest request) {
     AnalysisServer analysisServer = _server.analysisServer;
     if (analysisServer == null) {
       return _returnFailure(request, 'Analysis server is not running');
     }
     _writeResponse(request, (StringBuffer buffer) {
       _writePage(buffer, 'Analysis Server - Analysis Performance', [],
           (StringBuffer buffer) {
         buffer.write('<h3>Analysis Performance</h3>');
+
+        //
+        // Write performance tags.
+        //
+        {
+          buffer.write('<p><b>Time spent in each phase of analysis</b></p>');
+          buffer.write(
+              '<table style="border-collapse: separate; border-spacing: 10px 5px;">');
+          _writeRow(buffer, ['Time (in ms)', 'Percent', 'Analysis Phase'],
+              header: true);
+          // prepare sorted tags
+          List<PerformanceTag> tags = PerformanceTag.all.toList();
+          tags.remove(ServerPerformanceStatistics.idle);
+          tags.sort((a, b) => b.elapsedMs - a.elapsedMs);
+          // prepare total time
+          int totalTime = 0;
+          tags.forEach((PerformanceTag tag) {
+            totalTime += tag.elapsedMs;
+          });
+          // write rows
+          void writeRow(PerformanceTag tag) {
+            double percent = (tag.elapsedMs * 100) / totalTime;
+            String percentStr = '${percent.toStringAsFixed(2)}%';
+            _writeRow(buffer, [tag.elapsedMs, percentStr, tag.label],
+                classes: ["right", "right", null]);
+          }
+          tags.forEach(writeRow);
+          buffer.write('</table>');
+        }
+
+        //
+        // Write new task model timing information.
+        //
         if (AnalysisEngine.instance.useTaskModel) {
-          //
-          // Write new task model timing information.
-          //
           buffer.write('<p><b>Task performace data</b></p>');
           buffer.write(
               '<table style="border-collapse: separate; border-spacing: 10px 5px;">');
           _writeRow(buffer, [
             'Task Name',
             'Count',
             'Total Time (in ms)',
             'Average Time (in ms)'
           ], header: true);
 
           Map<Type, int> countMap = newTask.AnalysisTask.countMap;
           Map<Type, Stopwatch> stopwatchMap = newTask.AnalysisTask.stopwatchMap;
           List<Type> taskClasses = stopwatchMap.keys.toList();
           taskClasses.sort((Type first, Type second) =>
               first.toString().compareTo(second.toString()));
+          int totalTime = 0;
           taskClasses.forEach((Type taskClass) {
             int count = countMap[taskClass];
             if (count == null) {
               count = 0;
             }
-            int totalTime = stopwatchMap[taskClass].elapsedMilliseconds;
+            int taskTime = stopwatchMap[taskClass].elapsedMilliseconds;
+            totalTime += taskTime;
             _writeRow(buffer, [
               taskClass.toString(),
               count,
-              totalTime,
-              count <= 0 ? '-' : (totalTime / count).toStringAsFixed(3)
+              taskTime,
+              count <= 0 ? '-' : (taskTime / count).toStringAsFixed(3)
             ], classes: [null, "right", "right", "right"]);
           });
+          _writeRow(buffer, ['Total', '-', totalTime, '-'],
+              classes: [null, "right", "right", "right"]);
           buffer.write('</table>');
-        } else {
-          //
-          // Write old task model timing information.
-          //
-          {
-            buffer.write('<p><b>Time spent in each phase of analysis</b></p>');
-            buffer.write(
-                '<table style="border-collapse: separate; border-spacing: 10px 5px;">');
-            _writeRow(buffer, ['Time (in ms)', 'Percent', 'Analysis Phase'],
-                header: true);
-            // prepare sorted tags
-            List<PerformanceTag> tags = PerformanceTag.all.toList();
-            tags.remove(ServerPerformanceStatistics.idle);
-            tags.sort((a, b) => b.elapsedMs - a.elapsedMs);
-            // prepare total time
-            int totalTime = 0;
-            tags.forEach((PerformanceTag tag) {
-              totalTime += tag.elapsedMs;
-            });
-            // write rows
-            void writeRow(PerformanceTag tag) {
-              double percent = (tag.elapsedMs * 100) / totalTime;
-              String percentStr = '${percent.toStringAsFixed(2)}%';
-              _writeRow(buffer, [tag.elapsedMs, percentStr, tag.label],
-                  classes: ["right", "right", null]);
-            }
-            tags.forEach(writeRow);
-            buffer.write('</table>');
-          }
+        }
 
+        //
+        // Write old task model transition information.
+        //
+        {
           Map<DataDescriptor, Map<CacheState, int>> transitionMap =
               SourceEntry.transitionMap;
           buffer.write(
               '<p><b>Number of times a state transitioned to VALID (grouped by descriptor)</b></p>');
           if (transitionMap.isEmpty) {
             buffer.write('<p>none</p>');
           } else {
             List<DataDescriptor> descriptors = transitionMap.keys.toList();
             descriptors.sort((DataDescriptor first, DataDescriptor second) =>
                 first.toString().compareTo(second.toString()));
@@ skipping 1278 matching lines @@
    */
   static String makeLink(
       String path, Map<String, String> params, String innerHtml,
       [bool hasError = false]) {
     Uri uri = new Uri(path: path, queryParameters: params);
     String href = HTML_ESCAPE.convert(uri.toString());
     String classAttribute = hasError ? ' class="error"' : '';
     return '<a href="$href"$classAttribute>$innerHtml</a>';
   }
 }