timers: fix eventloop block

When there are at least 2 timers set by setInterval whose callback execution are longer than interval, the eventloop will be blocked. This commit fix the above bug. PR-URL: #15072 Fixes: #15068 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Nov 21, 2017 · ec69f0b · ec69f0b
1 parent fe6829d
commit ec69f0b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/lib/timers.js b/lib/timers.js
@@ -183,7 +183,7 @@ function listOnTimeout() {
     if (diff < msecs) {
       var timeRemaining = msecs - (TimerWrap.now() - timer._idleStart);
       if (timeRemaining < 0) {
-        timeRemaining = 0;
+        timeRemaining = 1;
       }
       this.start(timeRemaining);
       debug('%d list wait because diff is %d', msecs, diff);

diff --git a/test/sequential/test-timers-block-eventloop.js b/test/sequential/test-timers-block-eventloop.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const common = require('../common');
+const fs = require('fs');
+
+const t1 = setInterval(() => {
+  common.busyLoop(12);
+}, 10);
+
+const t2 = setInterval(() => {
+  common.busyLoop(15);
+}, 10);
+
+const t3 = setTimeout(common.mustNotCall('eventloop blocked!'), 100);
+
+setTimeout(function() {
+  fs.stat('./nonexistent.txt', (err, stats) => {
+    clearInterval(t1);
+    clearInterval(t2);
+    clearTimeout(t3);
+  });
+}, 50);