process: remove maxTickDepth from _tickCallback

Removes the check for maxTickDepth for non-domain callbacks. So a user can starve I/O by setting a recursive nextTick. The domain case is more complex and will be addressed in another commit.
nodejs · May 30, 2013 · 0761c90 · 0761c90
1 parent 5b636fe
commit 0761c90
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 138 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -1029,7 +1029,6 @@ MakeCallback(const Handle<Object> object,
 
   if (tick_infobox.length == 0) {
     tick_infobox.index = 0;
-    tick_infobox.depth = 0;
     return ret;
   }
 

diff --git a/src/node.js b/src/node.js
@@ -398,25 +398,18 @@
       if (inTick) return;
       if (infoBox[length] === 0) {
         infoBox[index] = 0;
-        infoBox[depth] = 0;
         return;
       }
       inTick = true;
 
-      while (infoBox[depth]++ < process.maxTickDepth) {
-        nextTickLength = infoBox[length];
-        if (infoBox[index] === nextTickLength)
-          return tickDone(0);
-
-        while (infoBox[index] < nextTickLength) {
-          callback = nextTickQueue[infoBox[index]++].callback;
-          threw = true;
-          try {
-            callback();
-            threw = false;
-          } finally {
-            if (threw) tickDone(infoBox[depth]);
-          }
+      while (infoBox[index] < infoBox[length]) {
+        callback = nextTickQueue[infoBox[index]++].callback;
+        threw = true;
+        try {
+          callback();
+          threw = false;
+        } finally {
+          if (threw) tickDone(0);
         }
       }
 
@@ -476,8 +469,6 @@
       // on the way out, don't bother. it won't get fired anyway.
       if (process._exiting)
         return;
-      if (infoBox[depth] >= process.maxTickDepth)
-        maxTickWarn();
 
       var obj = { callback: callback, domain: null };
 

diff --git a/test/message/max_tick_depth.out b/test/message/max_tick_depth.out
@@ -8,7 +8,6 @@ tick 14
 tick 13
 tick 12
 tick 11
-(node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral.
 tick 10
 tick 9
 tick 8
@@ -19,5 +18,4 @@ tick 4
 tick 3
 tick 2
 tick 1
-(node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral.
 tick 0
diff --git a/test/message/max_tick_depth_trace.js b/test/message/max_tick_depth_trace.js
diff --git a/test/message/max_tick_depth_trace.out b/test/message/max_tick_depth_trace.out
diff --git a/test/simple/test-next-tick-starvation.js b/test/simple/test-next-tick-starvation.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ tick 14 @@
     tick 13
     tick 12
     tick 11
-    (node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral.
     tick 10
     tick 9
     tick 8
@@ Expand All / @@ -19,5 +18,4 @@ tick 4 @@
     tick 3
     tick 2
     tick 1
-    (node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral.
     tick 0