Add constant info to the dart2js_info model

bin/library_size_split.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.
 
 /// Command-line tool to show the size distribution of generated code among
 /// libraries. Libraries can be grouped using regular expressions. You can
 /// specify what regular expressions to use by providing a `grouping.yaml` file.
 /// The format of the `grouping.yaml` file is as follows:
 /// ```yaml
 /// groups:
@@ skipping 12 matching lines @@
 ///   specification implicitly defines several groups, one per observed name.
 ///
 ///   * cluster (optional): a clustering index for how data is shown in a table.
 ///   Groups with higher cluster indices are shown later in the table after a
 ///   dividing line. If missing, the cluster index defaults to 0.
 ///
 /// Here is an example configuration, with comments about what each entry does:
 ///
 /// ```yaml
 /// groups:
-/// # This group shows the total size of all libraries together, it is shown in
-/// # cluster #3, which happens to be the last cluster in this example:
-/// - name: "Total (excludes preambles, statics & consts)"
-///   regexp: ".*"
-///   cluster: 3
-///
 /// # This group shows the total size for all libraries that were loaded from
-/// # file:// urls:
+/// # file:// urls, it is shown in cluster #2, which happens to be the last
+/// # cluster in this example before the totals are shown:
 /// - { name: "Loose files", regexp: "file://.*", cluster: 2}
 ///
 /// # This group shows the total size of all code loaded from packages:
 /// - { name: "All packages", regexp: "package:.*", cluster: 2}
 ///
 /// # This group shows the total size of all code loaded from core libraries:
 /// - { name: "Core libs", regexp: "dart:.*", cluster: 2}
 ///
 /// # This group shows the total size of all libraries in a single package. Here
 /// # we omitted the `name` entry, instead we extract it from the regexp
@@ skipping 35 matching lines @@
       ? new File(args[1]).readAsStringSync() : defaultGrouping;
   var groupingYaml = loadYaml(groupingText);
   var groups = [];
   for (var group in groupingYaml['groups']) {
     groups.add(new _Group(group['name'],
         new RegExp(group['regexp']),
         group['cluster'] ?? 0));
   }
 
   var sizes = {};
+  var allLibs = 0;
   for (LibraryInfo lib in info.libraries) {
+    allLibs += lib.size;
     groups.forEach((group) {
       var match = group.matcher.firstMatch('${lib.uri}');
       if (match != null) {
         var name = group.name;
         if (name == null && match.groupCount > 0) name = match.group(1);
         if (name == null) name = match.group(0);
         sizes.putIfAbsent(name, () => new _SizeEntry(name, group.cluster));
         sizes[name].size += lib.size;
       }
     });
   }
 
+  var allConstants = 0;
+  for (var constant in info.constants) {
+    allConstants += constant.size;
+  }
+
   var all = sizes.keys.toList();
   all.sort((a, b) => sizes[a].compareTo(sizes[b]));
   var realTotal = info.program.size;
-  var longest = all.fold(0, (count, value) => max(count, value.length));
+  var longest = 0;

[Harry Terkelsen, 2015/08/19 17:41:31]

var longest = 'Program Size'.length;

and then remove `longest = max(0, 'Program Size'.length)` below

[Siggi Cherem (dart-lang), 2015/08/19 19:31:15]

Ah - sorry, I meant to remove that line :) - it's now handled by _addRow.

Good catch!

+  var rows = [];
   longest = max(longest, 'Program Size'.length);
+  _addRow(String label, int value) {
+    rows.add(new _Row(label, value));
+    longest = max(longest, label.length);
+  }
+
+  _printRow(_Row row) {
+    if (row is _Divider) {
+      print(' ' + ('-' * (longest + 18)));
+      return;
+    }
+
+    var percent = row.value == realTotal ? '100'
+      : (row.value * 100 / realTotal).toStringAsFixed(2);
+    print(' ${_pad(row.label, longest + 1, right: true)}'
+        ' ${_pad(row.value, 8)} ${_pad(percent, 6)}%');
+  }
+
   var lastCluster = 0;
   for (var name in all) {
     var entry = sizes[name];
     if (lastCluster < entry.cluster) {
-      print(' ' + ('-' * (longest + 18)));
+      rows.add(const _Divider());
       lastCluster = entry.cluster;
     }
     var size = entry.size;
-    var percent = (size * 100 / realTotal).toStringAsFixed(2);
-    print(' ${_pad(name, longest + 1, right: true)}'
-          ' ${_pad(size, 8)} ${_pad(percent, 6)}%');
+    _addRow(name, size);
   }
-  print(' ${_pad("Program Size", longest + 1, right: true)}'
-      ' ${_pad(realTotal, 8)} ${_pad(100, 6)}%');
+  rows.add(const _Divider());
+  _addRow("All libraries (excludes preambles, statics & consts)", allLibs);
+  _addRow("Shared consts", allConstants);
+  _addRow("Total accounted", allLibs + allConstants);
+  _addRow("Program Size", realTotal);
+  rows.forEach(_printRow);
 }
 
 /// A group defined in the configuration.
 class _Group {
   /// Name of the group. May be null if the name is derived from the matcher. In
   /// that case, the name would be group(1) of the matched expression if it
   /// exist, or group(0) otherwise.
   final String name;
 
   /// Regular expression matching members of the group.
@@ skipping 11 matching lines @@
   final String name;
   final int cluster;
   int size = 0;
 
   _SizeEntry(this.name, this.cluster);
 
   int compareTo(_SizeEntry other) =>
       cluster == other.cluster ? size - other.size : cluster - other.cluster;
 }
 
+class _Row {
+  final String label;
+  final int value;
+  const _Row(this.label, this.value);
+}
+
+class _Divider extends _Row {
+  const _Divider() : super('', 0);
+}
+
 _pad(value, n, {bool right: false}) {
   var s = '$value';
   if (s.length >= n) return s;
   var pad = ' ' * (n - s.length);
   return right ? '$s$pad' : '$pad$s';
 }
 
 /// Default grouping specification that includes an entry per library, and
 /// grouping entries for each package, all packages, all core libs, and loose
 /// files.
 final defaultGrouping = """
 groups:
-- { name: "Total (excludes preambles, statics & consts)", regexp: ".*", cluster: 3}
 - { name: "Loose files", regexp: "file://.*", cluster: 2}
 - { name: "All packages", regexp: "package:.*", cluster: 2}
 - { name: "Core libs", regexp: "dart:.*", cluster: 2}
 # We omitted `name` to extract the group name from the regexp directly.
 # Here the name is the name of the package:
 - { regexp: "package:([^/]*)", cluster: 1}
 # Here the name is the url of the package and dart core libraries:
 - { regexp: "package:.*"}
 - { regexp: "dart:.*"}
 # Here the name is the relative path of loose files:
 - { regexp: "file://${Directory.current.path}/(.*)" }
 """;