Skip to content

Commit

Permalink
timers: remove dead code and simplify args check
Browse files Browse the repository at this point in the history
The `setUnrefTimeout` function is never called with more arguments
than two. So quite some code was dead and never used. This removes
that code and simplifies the args check not to coerce objects to
booleans.

PR-URL: #26555
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
  • Loading branch information
BridgeAR committed Mar 14, 2019
1 parent bc09d2f commit 143dbb3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 25 deletions.
25 changes: 2 additions & 23 deletions lib/internal/timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,34 +102,13 @@ Timeout.prototype.refresh = function() {
return this;
};

function setUnrefTimeout(callback, after, arg1, arg2, arg3) {
function setUnrefTimeout(callback, after) {
// Type checking identical to setTimeout()
if (typeof callback !== 'function') {
throw new ERR_INVALID_CALLBACK();
}

let i, args;
switch (arguments.length) {
// fast cases
case 1:
case 2:
break;
case 3:
args = [arg1];
break;
case 4:
args = [arg1, arg2];
break;
default:
args = [arg1, arg2, arg3];
for (i = 5; i < arguments.length; i++) {
// Extend array dynamically, makes .apply run much faster in v6.0.0
args[i - 2] = arguments[i];
}
break;
}

const timer = new Timeout(callback, after, args, false);
const timer = new Timeout(callback, after, undefined, false);
getTimers()._unrefActive(timer);

return timer;
Expand Down
5 changes: 3 additions & 2 deletions lib/timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ function listOnTimeout(list, now) {

try {
const args = timer._timerArgs;
if (!args)
if (args === undefined)
timer._onTimeout();
else
Reflect.apply(timer._onTimeout, timer, args);
Expand Down Expand Up @@ -462,8 +462,9 @@ function setTimeout(callback, after, arg1, arg2, arg3) {
}

setTimeout[internalUtil.promisify.custom] = function(after, value) {
const args = value !== undefined ? [value] : value;
return new Promise((resolve) => {
active(new Timeout(resolve, after, [value], false));
active(new Timeout(resolve, after, args, false));
});
};

Expand Down

0 comments on commit 143dbb3

Please sign in to comment.