Use Zone to correctly measure async operations.

pkg/compiler/lib/src/apiimpl.dart

 // Copyright (c) 2012, 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 leg_apiimpl;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart' as pkgs;
 import 'package:package_config/src/packages_impl.dart' show
     MapPackages,
     NonFilePackagesDirectoryPackages;
 import 'package:package_config/src/util.dart' show
     checkValidPackageUri;
 
 import '../compiler_new.dart' as api;
 import 'commandline_options.dart';
 import 'common.dart';
 import 'common/tasks.dart' show
-    GenericTask;
+    GenericTask,
+    Measurer;
 import 'common/backend_api.dart' show
     Backend;
 import 'compiler.dart';
 import 'diagnostics/diagnostic_listener.dart' show
     DiagnosticOptions;
 import 'diagnostics/messages.dart' show
     Message;
 import 'elements/elements.dart' as elements;
 import 'io/source_file.dart';
 import 'platform_configuration.dart' as platform_configuration;
@@ skipping 371 matching lines @@
               node,
               MessageKind.LIBRARY_NOT_FOUND,
               {'resolvedUri': uri});
           return null;
         });
   }
 
   Future<elements.LibraryElement> analyzeUri(
       Uri uri,
       {bool skipLibraryWithPartOfTag: true}) {
-    List<Future> setupFutures = new List<Future>();
-    if (sdkLibraries == null) {
-      setupFutures.add(setupSdk());
-    }
-    if (packages == null) {
-      setupFutures.add(setupPackages(uri));
-    }
-    return Future.wait(setupFutures).then((_) => super.analyzeUri(uri));
+    return new Future(() => (sdkLibraries == null) ? setupSdk() : null)
+        .then((_) => packages == null ? setupPackages(uri) : null)
+        .then((_) => super.analyzeUri(uri));
   }
 
   Future setupPackages(Uri uri) {
     if (packageRoot != null) {
       // Use "non-file" packages because the file version requires a [Directory]
       // and we can't depend on 'dart:io' classes.
       packages = new NonFilePackagesDirectoryPackages(packageRoot);
     } else if (packageConfig != null) {
       return callUserProvider(packageConfig).then((packageConfigContents) {
         if (packageConfigContents is String) {
@@ skipping 34 matching lines @@
         sdkLibraries = mapping;
       });
     } else {
       // The incremental compiler sets up the sdk before run.
       // Therefore this will be called a second time.
       return new Future.value(null);
     }
   }
 
   Future<bool> run(Uri uri) {
-    log('Using platform configuration at ${platformConfigUri}');
+    Duration setupDuration = measurer.wallClock.elapsed;
+    return selfTask.measureSubtask("CompilerImpl.run", () {
+      log('Using platform configuration at ${platformConfigUri}');
 
-    return Future.wait([setupSdk(), setupPackages(uri)]).then((_) {
-      assert(sdkLibraries != null);
-      assert(packages != null);
-
-      return super.run(uri).then((bool success) {
-        int cumulated = 0;
+      return setupSdk().then((_) => setupPackages(uri)).then((_) {
+        assert(sdkLibraries != null);
+        assert(packages != null);
+        return super.run(uri);
+      }).then((bool success) {
+        StringBuffer timings = new StringBuffer();
+        timings.writeln("Timings:");
+        Duration totalDuration = measurer.wallClock.elapsed;
+        Duration asyncDuration = measurer.asyncWallClock.elapsed;
+        Duration cumulatedDuration = Duration.ZERO;
         for (final task in tasks) {
-          int elapsed = task.timing;
-          if (elapsed != 0) {
-            cumulated += elapsed;
-            log('${task.name} took ${elapsed}msec');
+          String running = task.isRunning ? "*" : "";
+          Duration duration = task.duration;
+          if (duration != Duration.ZERO) {
+            cumulatedDuration += duration;
+            timings.writeln(
+                '    $running${task.name} took'
+                ' ${duration.inMilliseconds}msec');
             for (String subtask in task.subtasks) {
               int subtime = task.getSubtaskTime(subtask);
-              log('${task.name} > $subtask took ${subtime}msec');
+              String running = task.getSubtaskIsRunning(subtask) ? "*" : "";
+              timings.writeln(
+                  '    $running${task.name} > $subtask took ${subtime}msec');
             }
           }
         }
-        int total = totalCompileTime.elapsedMilliseconds;
-        log('Total compile-time ${total}msec;'
-            ' unaccounted ${total - cumulated}msec');
+        Duration unaccountedDuration =
+            totalDuration - cumulatedDuration - setupDuration - asyncDuration;
+        double percent = unaccountedDuration.inMilliseconds * 100
+            / totalDuration.inMilliseconds;
+        timings.write(
+            '    Total compile-time ${totalDuration.inMilliseconds}msec;'
+            ' setup ${setupDuration.inMilliseconds}msec;'
+            ' async ${asyncDuration.inMilliseconds}msec;'
+            ' unaccounted ${unaccountedDuration.inMilliseconds}msec'
+            ' (${percent.toStringAsFixed(2)}%)');
+        log("$timings");
         return success;
       });
     });
   }
 
   void reportDiagnostic(DiagnosticMessage message,
                         List<DiagnosticMessage> infos,
                         api.Diagnostic kind) {
     _reportDiagnosticMessage(message, kind);
     for (DiagnosticMessage info in infos) {
@@ skipping 28 matching lines @@
       });
     } catch (ex, s) {
       diagnoseCrashInUserCode(
           'Uncaught exception in diagnostic handler', ex, s);
       rethrow;
     }
   }
 
   Future callUserProvider(Uri uri) {
     try {
-      return userProviderTask.measure(() => provider.readFromUri(uri));
+      return userProviderTask.measureIo(() => provider.readFromUri(uri));
     } catch (ex, s) {
       diagnoseCrashInUserCode('Uncaught exception in input provider', ex, s);
       rethrow;
     }
   }
 
   Future<Packages> callUserPackagesDiscovery(Uri uri) {
     try {
-      return userPackagesDiscoveryTask.measure(
+      return userPackagesDiscoveryTask.measureIo(
                  () => packagesDiscoveryProvider(uri));
     } catch (ex, s) {
       diagnoseCrashInUserCode('Uncaught exception in package discovery', ex, s);
       rethrow;
     }
   }
 
   fromEnvironment(String name) => environment[name];
 
   Uri lookupLibraryUri(String libraryName) {
     assert(invariant(NO_LOCATION_SPANNABLE,
         sdkLibraries != null, message: "setupSdk() has not been run"));
     return sdkLibraries[libraryName];
   }
 
   Uri resolvePatchUri(String libraryName) {
     return backend.resolvePatchUri(libraryName, platformConfigUri);
   }
 }