timers: fix setTimeout expiration logic

Fix the timer logic to be the same as v10.30.0. Fixes: #24203 PR-URL: #24214 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Anatoli Papirovski <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]>
nodejs · Dec 5, 2018 · d2e9b76 · d2e9b76
1 parent 3fe4498
commit d2e9b76
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/timers.js b/lib/timers.js
@@ -283,7 +283,7 @@ function listOnTimeout(list, now) {
     // Check if this loop iteration is too early for the next timer.
     // This happens if there are more timers scheduled for later in the list.
     if (diff < msecs) {
-      list.expiry = timer._idleStart + msecs;
+      list.expiry = Math.max(timer._idleStart + msecs, now + 1);
       list.id = timerListId++;
       queue.percolateDown(1);
       debug('%d list wait because diff is %d', msecs, diff);

diff --git a/test/parallel/test-timers-timeout-with-non-integer.js b/test/parallel/test-timers-timeout-with-non-integer.js
@@ -0,0 +1,15 @@
+'use strict';
+const common = require('../common');
+
+/**
+ * This test is for https://github.com/nodejs/node/issues/24203
+ */
+let count = 50;
+const time = 1.00000000000001;
+const exec = common.mustCall(() => {
+  if (--count === 0) {
+    return;
+  }
+  setTimeout(exec, time);
+}, count);
+exec();