Tweaks to the profiling diagnostics page.

pkg/analysis_server/lib/src/status/diagnostics.dart

 // Copyright (c) 2017, 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.
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
@@ skipping 970 matching lines @@
 
     List<Plugin> plugins = [
       AnalysisEngine.instance.enginePlugin,
       server.serverPlugin
     ];
     plugins.addAll(server.userDefinedPlugins);
     ul(plugins, writePlugin);
   }
 }
 
-// TODO(devoncarew): Show the last x requests and responses.
 class ProfilePage extends DiagnosticPageWithNav {
   ProfilePage(DiagnosticsSite site)
       : super(site, 'profile', 'Profiling Info',
-            description: 'Profiling performance tag data.');
+            description: 'Profiling performance tag data and lint timings.');
 
   @override
   void generateContent(Map<String, String> params) {
+    h3('Profiling performance tag data');
+
     // prepare sorted tags
     List<PerformanceTag> tags = PerformanceTag.all.toList();
     tags.remove(ServerPerformanceStatistics.idle);
     tags.remove(PerformanceTag.unknown);
     tags.removeWhere((tag) => tag.elapsedMs == 0);
     tags.sort((a, b) => b.elapsedMs - a.elapsedMs);
 
+    // print total time
+    int totalTime =
+        tags.fold<int>(0, (int a, PerformanceTag tag) => a + tag.elapsedMs);
+    p('Total measured time: ${printMilliseconds(totalTime)}');
+
     // draw a pie chart
     String rowData =
         tags.map((tag) => "['${tag.label}', ${tag.elapsedMs}]").join(',');
     buf.writeln(
         '<div id="chart-div" style="width: 700px; height: 300px;"></div>');
     buf.writeln('''
       <script type="text/javascript">
         google.charts.load('current', {'packages':['corechart']});
         google.charts.setOnLoadCallback(drawChart);
 
         function drawChart() {
           var data = new google.visualization.DataTable();
           data.addColumn('string', 'Tag');
           data.addColumn('number', 'Time (ms)');
           data.addRows([$rowData]);
           var options = {'title': 'Performance Tag Data', 'width': 700, 'height': 300};
           var chart = new google.visualization.PieChart(document.getElementById('chart-div'));
           chart.draw(data, options);
         }
       </script>
 ''');
 
-    // print total time
-    int totalTime =
-        tags.fold<int>(0, (int a, PerformanceTag tag) => a + tag.elapsedMs);
-    p('Total measured time: ${printMilliseconds(totalTime)}');
-
     // write out a table
     void _writeRow(List<String> data, {bool header: false}) {
       buf.write('<tr>');
       if (header) {
         for (String d in data) {
           buf.write('<th>$d</th>');
         }
       } else {
         buf.write('<td>${data[0]}</td>');
 
@@ skipping 11 matching lines @@
       _writeRow([
         tag.label,
         printMilliseconds(tag.elapsedMs),
         printPercentage(percent)
       ]);
     }
 
     tags.forEach(writeRow);
     buf.write('</table>');
 
+    h3('Lint rule timings');
     List<LintRule> rules = Registry.ruleRegistry.rules.toList();
+    int totalLintTime = rules.fold(0,
+        (sum, rule) => sum + lintRegistry.getTimer(rule).elapsedMilliseconds);
+    p('Total time spent in lints: ${printMilliseconds(totalLintTime)}');
+
     rules.sort((first, second) {
       int firstTime = lintRegistry.getTimer(first).elapsedMilliseconds;
       int secondTime = lintRegistry.getTimer(second).elapsedMilliseconds;
       if (firstTime == secondTime) {
         return first.lintCode.name.compareTo(second.lintCode.name);
       }
       return secondTime - firstTime;
     });
-    p('Lint rule timings');
     buf.write('<table>');
     _writeRow(['Lint code', 'Time (in ms)'], header: true);
-    int totalLintTime = 0;
     for (var rule in rules) {
       int time = lintRegistry.getTimer(rule).elapsedMilliseconds;
-      totalLintTime += time;
-      _writeRow([rule.lintCode.name, time.toString()]);
+      _writeRow([rule.lintCode.name, printMilliseconds(time)]);
     }
     buf.write('</table>');
-    p('Total time spent in lints: $totalLintTime ms');
   }
 }
 
 class StatusPage extends DiagnosticPageWithNav {
   StatusPage(DiagnosticsSite site)
       : super(site, 'status', 'Status',
             description:
                 'General status and diagnostics for the analysis server.');
 
   @override
@@ skipping 57 matching lines @@
     h3('Execution domain');
     ul(ExecutionService.VALUES, (item) {
       if (domain.onFileAnalyzed != null) {
         buf.write('$item (has subscriptions)');
       } else {
         buf.write('$item (no subscriptions)');
       }
     });
   }
 }