From aa91dff1bf52a5af9bcf364cb0b2d0f1cb549a19 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Wed, 17 Apr 2013 14:13:19 -0700
Subject: [PATCH] Queue behavior v1, flush until mark

---
 packages/meteor/fiber_helpers.js      |  5 +++--
 packages/meteor/fiber_stubs_client.js | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/meteor/fiber_helpers.js b/packages/meteor/fiber_helpers.js
index 9069a32525..e1eb5ba8bd 100644
--- a/packages/meteor/fiber_helpers.js
+++ b/packages/meteor/fiber_helpers.js
@@ -78,9 +78,10 @@ _.extend(Meteor._SynchronousQueue.prototype, {
     self._scheduleRun();
     // No need to block.
   },
-  taskRunning: function () {
+
+  flush: function () {
     var self = this;
-    return self._taskRunning;
+    self.runTask(function () {});
   },
 
   safeToRunTask: function () {
diff --git a/packages/meteor/fiber_stubs_client.js b/packages/meteor/fiber_stubs_client.js
index ebbebfb61e..79fb1c6a3c 100644
--- a/packages/meteor/fiber_stubs_client.js
+++ b/packages/meteor/fiber_stubs_client.js
@@ -17,15 +17,19 @@ Meteor._SynchronousQueue = function () {
 _.extend(Meteor._SynchronousQueue.prototype, {
   runTask: function (task) {
     var self = this;
+    if (!self.safeToRunTask())
+      throw new Error("Could not synchronously run a task from a running task");
     self._tasks.push(task);
+    var tasks = self._tasks;
+    self._tasks = [];
     self._running = true;
     try {
-      while (!_.isEmpty(self._tasks)) {
-        var t = self._tasks.shift();
+      while (!_.isEmpty(tasks)) {
+        var t = tasks.shift();
         try {
           t();
         } catch (e) {
-          if (_.isEmpty(self._tasks)) {
+          if (_.isEmpty(tasks)) {
             // this was the last task, that is, the one we're calling runTask
             // for.
             throw e;
@@ -41,7 +45,12 @@ _.extend(Meteor._SynchronousQueue.prototype, {
 
   queueTask: function (task) {
     var self = this;
+    var wasEmpty = _.isEmpty(self._tasks);
     self._tasks.push(task);
+    // Intentionally not using Meteor.setTimeout, because it doesn't like runing
+    // in stubs for now.
+    if (wasEmpty)
+      setTimeout(_.bind(self.flush, self), 0);
   },
 
   flush: function () {
@@ -49,12 +58,8 @@ _.extend(Meteor._SynchronousQueue.prototype, {
     self.runTask(function () {});
   },
 
-  taskRunning: function () {
-    var self = this;
-    return self._running;
-  },
-
   safeToRunTask: function () {
-    return true;
+    var self = this;
+    return !self._running;
   }
 });