timers: clean up for readability

Remove micro-optimizations that no longer yield any benefits,
restructure timers & immediates to be a bit more straightforward.

Adjust timers benchmarks to run long enough to offer meaningful data.

PR-URL: https://github.com/nodejs/node/pull/17279
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/benchmark/timers/set-immediate-depth-args.js b/benchmark/timers/set-immediate-depth-args.js
index 1f12ae6ec7..704b181451 100644
--- a/benchmark/timers/set-immediate-depth-args.js
+++ b/benchmark/timers/set-immediate-depth-args.js
@@ -2,7 +2,7 @@
 
 const common = require('../common.js');
 const bench = common.createBenchmark(main, {
-  millions: [10]
+  millions: [5]
 });
 
 function main(conf) {
@@ -15,9 +15,9 @@ function main(conf) {
   function cb3(n, arg2, arg3) {
     if (--n) {
       if (n % 3 === 0)
-        setImmediate(cb3, n, true, null);
+        setImmediate(cb3, n, true, null, 5.1, null, true);
       else if (n % 2 === 0)
-        setImmediate(cb2, n, 5.1);
+        setImmediate(cb2, n, 5.1, true);
       else
         setImmediate(cb1, n);
     }
@@ -25,9 +25,9 @@ function main(conf) {
   function cb2(n, arg2) {
     if (--n) {
       if (n % 3 === 0)
-        setImmediate(cb3, n, true, null);
+        setImmediate(cb3, n, true, null, 5.1, null, true);
       else if (n % 2 === 0)
-        setImmediate(cb2, n, 5.1);
+        setImmediate(cb2, n, 5.1, true);
       else
         setImmediate(cb1, n);
     }
@@ -35,9 +35,9 @@ function main(conf) {
   function cb1(n) {
     if (--n) {
       if (n % 3 === 0)
-        setImmediate(cb3, n, true, null);
+        setImmediate(cb3, n, true, null, 5.1, null, true);
       else if (n % 2 === 0)
-        setImmediate(cb2, n, 5.1);
+        setImmediate(cb2, n, 5.1, true);
       else
         setImmediate(cb1, n);
     }