Add runAsync interceptor.

sdk/lib/async/zone.dart

 // Copyright (c) 2013, 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.
 
 part of dart.async;
 
 /**
  * A Zone represents the asynchronous version of a dynamic extent. Asynchronous
  * callbacks are executed in the zone they have been queued in. For example,
  * the callback of a `future.then` is executed in the same zone as the one where
@@ skipping 20 matching lines @@
    *
    * The main purpose of this method is to allow `this` to attach debugging
    * information to the returned zone.
    */
   _Zone fork();
 
   /**
    * Tells the zone that it needs to wait for one more callback before it is
    * done.
    *
-   * Use [executeCallback] or [cancelCallbackExpectation] when the callback is executed
-   * (or canceled).
+   * Use [executeCallback] or [cancelCallbackExpectation] when the callback is
+   * executed (or canceled).
    */
   void expectCallback();
 
   /**
    * Tells the zone not to wait for a callback anymore.
    *
    * Prefer calling [executeCallback], instead. This method is mostly useful
    * for repeated callbacks (for example with [Timer.periodic]). In this case
    * one should should call [expectCallback] when the repeated callback is
    * initiated, and [cancelCallbackExpectation] when the [Timer] is canceled.
@@ skipping 20 matching lines @@
    */
   void executePeriodicCallback(void fun());
 
   /**
    * Same as [executePeriodicCallback] but catches uncaught errors and gives
    * them to [handleUncaughtError].
    */
   void executePeriodicCallbackGuarded(void fun());
 
   /**
-   * Runs [fun] asynchronously in this zone.
+   * Execute [fun] in `this` zone.

[Lasse Reichstein Nielsen, 2013/06/26 09:24:29]

"fun" is untraditional naming: either "action" or just "f".
It's not funny!

Add "and return [fun]'s return value." (which I assume it does, since there is
no "void" return type).

[floitsch, 2013/06/26 12:22:56]

Done.

+   *
+   * The behavior of this method should be the same as
+   * [executePeriodicCallback] except that it can have a return value.
    */
-  void runAsync(void fun());
+  runFromChildZone(fun());
+
+  /**
+   * Same as [runFromChildZone] but catches uncaught errors and gives them to
+   * [handleUncaughtError].
+   */
+  runFromChildZoneGuarded(fun());
+
+  /**
+   * Runs [fun] asynchronously in [zone].
+   */
+  void runAsync(void fun(), _Zone zone);
 
   /**
    * Creates a Timer where the callback is executed in this zone.
    */
   Timer createTimer(Duration duration, void callback());
 
   /**
    * Creates a periodic Timer where the callback is executed in this zone.
    */
   Timer createPeriodicTimer(Duration duration, void callback(Timer timer));
@@ skipping 117 matching lines @@
   }
 
   /**
    * Same as [executePeriodicCallback] but catches uncaught errors and gives
    * them to [handleUncaughtError].
    */
   void executePeriodicCallbackGuarded(void fun()) {
     this._runGuarded(fun);
   }
 
+  runFromChildZone(fun()) => this._runUnguarded(fun);
+  runFromChildZoneGuarded(fun()) => this._runGuarded(fun);
+
   _runInZone(fun(), bool handleUncaught) {
     if (identical(_Zone._current, this)
         && !handleUncaught
         && _isExecutingCallback) {
       // No need to go through a try/catch.
       return fun();
     }
 
     _Zone oldZone = _Zone._current;
     _Zone._current = this;
@@ skipping 31 matching lines @@
     return _runInZone(fun, true);
   }
 
   /**
    * Runs the function but doesn't catch uncaught errors.
    */
   _runUnguarded(void fun()) {
     return _runInZone(fun, false);
   }
 
-  runAsync(void fun()) {
-    _openCallbacks++;
-    _scheduleAsyncCallback(() {
-      _openCallbacks--;
-      _runGuarded(fun);
-    });
-  }
+  runAsync(void fun(), _Zone zone) => _parentZone.runAsync(fun, zone);
 
+  // TODO(floitsch): the zone should just forward to the parent zone. The
+  // default zone should then create the _ZoneTimer.
   Timer createTimer(Duration duration, void callback()) {
     return new _ZoneTimer(this, duration, callback);
   }
 
+  // TODO(floitsch): the zone should just forward to the parent zone. The
+  // default zone should then create the _ZoneTimer.
   Timer createPeriodicTimer(Duration duration, void callback(Timer timer)) {
     return new _PeriodicZoneTimer(this, duration, callback);
   }
 
   void _addChild(_Zone child) {
+    // TODO(floitsch): the zone should just increment a counter, but not keep
+    // a reference to the child.
     _children.add(child);
   }
 
   void _removeChild(_Zone child) {
     assert(!_children.isEmpty);
     // Children are usually added and removed fifo or filo.
     if (identical(_children.last, child)) {
       _children.length--;
       _checkIfDone();
       return;
@@ skipping 24 matching lines @@
     _scheduleAsyncCallback(() {
       print("Uncaught Error: ${error}");
       var trace = getAttachedStackTrace(error);
       _attachStackTrace(error, null);
       if (trace != null) {
         print("Stack Trace:\n$trace\n");
       }
       throw error;
     });
   }
+
+  void runAsync(void fun(), _Zone zone) {
+    if (identical(this, zone)) {
+      // No need to go through the zone when it's the default zone anyways.
+      _scheduleAsyncCallback(fun);
+      return;
+    }
+    zone.expectCallback();
+    _scheduleAsyncCallback(() {
+      zone.executeCallbackGuarded(fun);
+    });
+  }
 }
 
 typedef void _CompletionCallback();
 
 /**
  * A zone that executes a callback when the zone is dead.
  */
 class _WaitForCompletionZone extends _ZoneBase {
   final _CompletionCallback _onDone;
 
@@ skipping 18 matching lines @@
 typedef void _HandleErrorCallback(error);
 
 /**
  * A zone that collects all uncaught errors and provides them in a stream.
  * The stream is closed when the zone is done.
  */
 class _CatchErrorsZone extends _WaitForCompletionZone {
   final _HandleErrorCallback _handleError;
 
   _CatchErrorsZone(_Zone parentZone, this._handleError, void onDone())
-    : super(parentZone, onDone);
+      : super(parentZone, onDone);
 
   _Zone get _errorZone => this;
 
   handleUncaughtError(error) {
     try {
       _handleError(error);
     } catch(e, s) {
       if (identical(e, s)) {
         _parentZone.handleUncaughtError(error);
       } else {
         _parentZone.handleUncaughtError(_asyncError(e, s));
       }
     }
   }
 
   /**
    * Runs the given function asynchronously. Executes the [_onDone] callback
    * when the zone is done.
    */
   runWaitForCompletion(void fun()) {
     return this._runGuarded(fun);
   }
 
-  String toString() => "WithErrors ${super.toString()}";
+  String toString() => "CatchErrors ${super.toString()}";
+}
+
+typedef void _RunAsyncInterceptor(void callback());
+
+class _RunAsyncZone extends _ZoneBase {
+  final _RunAsyncInterceptor _runAsyncInterceptor;
+
+  _RunAsyncZone(_Zone parentZone, this._runAsyncInterceptor)
+      : super(parentZone);
+
+  void runAsync(void callback(), _Zone zone) {
+    zone.expectCallback();
+    _parentZone.runFromChildZone(() {
+      _runAsyncInterceptor(() => zone.executeCallbackGuarded(callback));
+    });
+  }
 }
 
 typedef void _TimerCallback();
 
 /**
  * A [Timer] class that takes zones into account.
  */
 class _ZoneTimer implements Timer {
   final _Zone _zone;
   final _TimerCallback _callback;
@@ skipping 45 matching lines @@
   }
 }
 
 /**
  * Runs [body] in its own zone.
  *
  * If [onError] is non-null the zone is considered an error zone. All uncaught
  * errors, synchronous or asynchronous, in the zone are caught and handled
  * by the callback.
  *
  * [onDone] (if non-null) is invoked when the zone has no more outstanding

[Lasse Reichstein Nielsen, 2013/06/26 09:24:29]

[onDone] -> The [onDone] callback
(avoid initial lower-case letter).

[floitsch, 2013/06/26 12:22:56]

Done.

  * callbacks.
  *
+ * [onRunAsync] (if non-null) is invoked when the [body] executes [runAsync].

[Lasse Reichstein Nielsen, 2013/06/26 09:24:29]

Ditto.

[floitsch, 2013/06/26 12:22:56]

Done.

+ * The handler is invoked in the outer zone and can therefore execute
+ * [runAsync] without invoking itself. The given callback must be executed
+ * eventually. Otherwise the nested zone will not complete. It must be
+ * executed only once.
+ *
  * Examples:
  *
  *     runZonedExperimental(() {
  *       new Future(() { throw "asynchronous error"; });
  *     }, onError: print);  // Will print "asynchronous error".
  *
  * The following example prints "1", "2", "3", "4" in this order.
  *
  *     runZonedExperimental(() {
  *       print(1);
  *       new Future.value(3).then(print);
  *     }, onDone: () { print(4); });
  *     print(2);
  *
  * Errors may never cross error-zone boundaries. This is intuitive for leaving
  * a zone, but it also applies for errors that would enter an error-zone.
  * Errors that try to cross error-zone boundaries are considered uncaught.
  *
  *     var future = new Future.value(499);
  *     runZonedExperimental(() {
  *       future = future.then((_) { throw "error in first error-zone"; });
  *       runZonedExperimental(() {
  *         future = future.catchError((e) { print("Never reached!"); });
  *       }, onError: (e) { print("unused error handler"); });
  *     }, onError: (e) { print("catches error of first error-zone."); });
  *
+ * The following example prints the stack trace whenever a callback is
+ * registered using [runAsync] (which is also used by [Completer]s and
+ * [StreamController]s.
+ *
+ *     printStackTrace() { try { throw 0; } catch(e, s) { print(s); } }
+ *     runZonedExperimental(body, onRunAsync: (callback) {
+ *       printStackTrace();
+ *       runAsync(callback);
+ *     });
  */
-runZonedExperimental(body(), { void onError(error), void onDone() }) {
+runZonedExperimental(body(),
+                     { void onRunAsync(void callback()),
+                       void onError(error),
+                       void onDone() }) {
+  if (onRunAsync != null) {
+    _RunAsyncZone zone = new _RunAsyncZone(_Zone._current, onRunAsync);
+    return zone._runUnguarded(() {
+      return runZonedExperimental(body, onError: onError, onDone: onDone);
+    });
+  }
+
   // TODO(floitsch): we probably still want to install a new Zone.
   if (onError == null && onDone == null) return body();
   if (onError == null) {
     _WaitForCompletionZone zone =
         new _WaitForCompletionZone(_Zone._current, onDone);
     return zone.runWaitForCompletion(body);
   }
   if (onDone == null) onDone = _nullDoneHandler;
   _CatchErrorsZone zone = new _CatchErrorsZone(_Zone._current, onError, onDone);
   return zone.runWaitForCompletion(body);
 }