Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Unified Diff: sdk/lib/async/schedule_microtask.dart

Issue 1487313002: Simplify scheduleMicrotask. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sdk/lib/async/zone.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/async/schedule_microtask.dart
diff --git a/sdk/lib/async/schedule_microtask.dart b/sdk/lib/async/schedule_microtask.dart
index acc4036ee7fa2e60646f64ebdbfba7aa639f4ddc..fac3f7f031128310614845322253ea1d796f4509 100644
--- a/sdk/lib/async/schedule_microtask.dart
+++ b/sdk/lib/async/schedule_microtask.dart
@@ -8,9 +8,8 @@ typedef void _AsyncCallback();
class _AsyncCallbackEntry {
final _AsyncCallback callback;
- final Zone zone;
_AsyncCallbackEntry next;
- _AsyncCallbackEntry(this.callback, this.zone);
+ _AsyncCallbackEntry(this.callback);
}
/** Head of single linked list of pending callbacks. */
@@ -39,23 +38,21 @@ void _microtaskLoop() {
_AsyncCallbackEntry entry = _nextCallback;
_nextCallback = entry.next;
if (_nextCallback == null) _lastCallback = null;
- Zone._current = entry.zone;
- entry.callback();
+ (entry.callback)();
Lasse Reichstein Nielsen 2015/12/02 06:49:22 Are you sure we shouldn't be setting the zone here
floitsch 2015/12/02 06:56:35 It is possible, but not trivial. Currently, we cal
}
}
-void _microtaskLoopEntry() {
+void _startMicrotaskLoop() {
_isInCallbackLoop = true;
try {
// Moved to separate function because try-finally prevents
// good optimization.
Lasse Reichstein Nielsen 2015/12/02 06:49:22 Side-comment: This (still) really sucks! If moving
floitsch 2015/12/02 06:56:35 I'm not even sure if it still is slower..
_microtaskLoop();
} finally {
- Zone._current = _ROOT_ZONE;
_lastPriorityCallback = null;
_isInCallbackLoop = false;
if (_nextCallback != null) {
- _AsyncRun._scheduleImmediate(_microtaskLoopEntry);
+ _AsyncRun._scheduleImmediate(_startMicrotaskLoop);
}
}
}
@@ -66,11 +63,12 @@ void _microtaskLoopEntry() {
* The microtask is called after all other currently scheduled
* microtasks, but as part of the current system event.
*/
-void _scheduleAsyncCallback(_AsyncCallbackEntry newEntry) {
+void _scheduleAsyncCallback(_AsyncCallback callback) {
+ _AsyncCallbackEntry newEntry = new _AsyncCallbackEntry(callback);
if (_nextCallback == null) {
_nextCallback = _lastCallback = newEntry;
if (!_isInCallbackLoop) {
- _AsyncRun._scheduleImmediate(_microtaskLoopEntry);
+ _AsyncRun._scheduleImmediate(_startMicrotaskLoop);
}
} else {
_lastCallback.next = newEntry;
@@ -87,12 +85,13 @@ void _scheduleAsyncCallback(_AsyncCallbackEntry newEntry) {
* Is always run in the root zone.
*/
void _schedulePriorityAsyncCallback(callback) {
- _AsyncCallbackEntry entry =
- new _AsyncCallbackEntry(callback, _ROOT_ZONE);
if (_nextCallback == null) {
- _scheduleAsyncCallback(entry);
+ _scheduleAsyncCallback(callback);
_lastPriorityCallback = _lastCallback;
- } else if (_lastPriorityCallback == null) {
+ return;
+ }
+ _AsyncCallbackEntry entry = new _AsyncCallbackEntry(callback);
+ if (_lastPriorityCallback == null) {
entry.next = _nextCallback;
_nextCallback = _lastPriorityCallback = entry;
} else {
« no previous file with comments | « no previous file | sdk/lib/async/zone.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698