fixup

Author: ronag

lib/internal/process/task_queues.js

@@ -56,63 +56,26 @@ function setHasTickScheduled(value) {
 const queue = new FixedQueue();
 
 // Should be in sync with RunNextTicksNative in node_task_queue.cc
-function runNextTicksNew() {
+function runNextTicks() {
   if (!hasTickScheduled() && !hasRejectionToWarn())
     runMicrotasks();
   if (!hasTickScheduled() && !hasRejectionToWarn())
     return;
 
-  processTicksAndRejectionsNew();
+  processTicksAndRejections();
 }
 
-// Should be in sync with RunNextTicksNative in node_task_queue.cc
-function runNextTicksOld() {
-  if (!hasTickScheduled() && !hasRejectionToWarn())
-    runMicrotasks();
-  if (!hasTickScheduled() && !hasRejectionToWarn())
-    return;
-
-  processTicksAndRejectionsOld();
-}
+function processTicksAndRejections() {
+  if (experimentalTaskOrdering === undefined) {
+    const { getOptionValue } = require('internal/options');
+    experimentalTaskOrdering = getOptionValue('--experimental-task-ordering');
+  }
 
-function processTicksAndRejectionsOld() {
   let tock;
   do {
-    while ((tock = queue.shift()) !== null) {
-      const asyncId = tock[async_id_symbol];
-      emitBefore(asyncId, tock[trigger_async_id_symbol], tock);
-
-      try {
-        const callback = tock.callback;
-        if (tock.args === undefined) {
-          callback();
-        } else {
-          const args = tock.args;
-          switch (args.length) {
-            case 1: callback(args[0]); break;
-            case 2: callback(args[0], args[1]); break;
-            case 3: callback(args[0], args[1], args[2]); break;
-            case 4: callback(args[0], args[1], args[2], args[3]); break;
-            default: callback(...args);
-          }
-        }
-      } finally {
-        if (destroyHooksExist())
-          emitDestroy(asyncId);
-      }
-
-      emitAfter(asyncId);
+    if (experimentalTaskOrdering) {
+      runMicrotasks();
     }
-    runMicrotasks();
-  } while (!queue.isEmpty() || processPromiseRejections());
-  setHasTickScheduled(false);
-  setHasRejectionToWarn(false);
-}
-
-function processTicksAndRejectionsNew() {
-  let tock;
-  do {
-    runMicrotasks();
     while ((tock = queue.shift()) !== null) {
       const asyncId = tock[async_id_symbol];
       emitBefore(asyncId, tock[trigger_async_id_symbol], tock);
@@ -138,6 +101,9 @@ function processTicksAndRejectionsNew() {
 
       emitAfter(asyncId);
     }
+    if (!experimentalTaskOrdering) {
+      runMicrotasks();
+    }
   } while (!queue.isEmpty() || processPromiseRejections());
   setHasTickScheduled(false);
   setHasRejectionToWarn(false);
@@ -205,23 +171,14 @@ function queueMicrotask(callback) {
 
 module.exports = {
   setupTaskQueue() {
-    if (experimentalTaskOrdering === undefined) {
-      const { getOptionValue } = require('internal/options');
-      experimentalTaskOrdering = getOptionValue('--experimental-task-ordering');
-    }
-
     // Sets the per-isolate promise rejection callback
     listenForRejections();
     // Sets the callback to be run in every tick.
-    setTickCallback(experimentalTaskOrdering
-      ? processTicksAndRejectionsNew
-      : processTicksAndRejectionsOld
+    setTickCallback(processTicksAndRejections
     );
     return {
       nextTick,
-      runNextTicks: experimentalTaskOrdering
-        ? runNextTicksNew
-        : runNextTicksOld,
+      runNextTicks
     };
   },
   queueMicrotask,