summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Bridgewater <ruben@bridgewater.de>2019-03-20 12:12:48 +0100
committerRuben Bridgewater <ruben@bridgewater.de>2019-03-27 17:05:14 +0100
commit9e8c9be3ff07845320c350fa3b2097cfbdada85e (patch)
tree6318cf01e3b6c8407c6fdce3b35681d09dd8be8c
parent6c913fb0287fa7f823fcd0fbe7035bac3c4f75ec (diff)
downloadandroid-node-v8-9e8c9be3ff07845320c350fa3b2097cfbdada85e.tar.gz
android-node-v8-9e8c9be3ff07845320c350fa3b2097cfbdada85e.tar.bz2
android-node-v8-9e8c9be3ff07845320c350fa3b2097cfbdada85e.zip
timers: rename validateTimerDuration to getTimerDuration
The function did not only validate the timer but it caused side effects like a warning and potentially returned a different value than the input value. Thus the name `validate` did not seem to be appropriate. PR-URL: https://github.com/nodejs/node/pull/26809 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--lib/_http_client.js6
-rw-r--r--lib/internal/stream_base_commons.js4
-rw-r--r--lib/internal/timers.js4
-rw-r--r--lib/timers.js4
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/_http_client.js b/lib/_http_client.js
index 6436d22f6e..63119d78be 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -45,7 +45,7 @@ const {
ERR_INVALID_PROTOCOL,
ERR_UNESCAPED_CHARACTERS
} = require('internal/errors').codes;
-const { validateTimerDuration } = require('internal/timers');
+const { getTimerDuration } = require('internal/timers');
const is_reused_symbol = require('internal/freelist').symbols.is_reused_symbol;
const {
DTRACE_HTTP_CLIENT_REQUEST,
@@ -146,7 +146,7 @@ function ClientRequest(input, options, cb) {
this.socketPath = options.socketPath;
if (options.timeout !== undefined)
- this.timeout = validateTimerDuration(options.timeout, 'timeout');
+ this.timeout = getTimerDuration(options.timeout, 'timeout');
var method = options.method;
var methodIsString = (typeof method === 'string');
@@ -743,7 +743,7 @@ ClientRequest.prototype.setTimeout = function setTimeout(msecs, callback) {
}
listenSocketTimeout(this);
- msecs = validateTimerDuration(msecs, 'msecs');
+ msecs = getTimerDuration(msecs, 'msecs');
if (callback) this.once('timeout', callback);
if (this.socket) {
diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js
index 67abba0992..3f53e3903a 100644
--- a/lib/internal/stream_base_commons.js
+++ b/lib/internal/stream_base_commons.js
@@ -21,7 +21,7 @@ const { owner_symbol } = require('internal/async_hooks').symbols;
const {
kTimeout,
setUnrefTimeout,
- validateTimerDuration
+ getTimerDuration
} = require('internal/timers');
const kMaybeDestroy = Symbol('kMaybeDestroy');
@@ -205,7 +205,7 @@ function setStreamTimeout(msecs, callback) {
this.timeout = msecs;
// Type checking identical to timers.enroll()
- msecs = validateTimerDuration(msecs, 'msecs');
+ msecs = getTimerDuration(msecs, 'msecs');
// Attempt to clear an existing timer in both cases -
// even if it will be rescheduled we don't want to leak an existing timer.
diff --git a/lib/internal/timers.js b/lib/internal/timers.js
index c8d8e5a6c3..d485c3ff65 100644
--- a/lib/internal/timers.js
+++ b/lib/internal/timers.js
@@ -359,7 +359,7 @@ function setUnrefTimeout(callback, after) {
}
// Type checking used by timers.enroll() and Socket#setTimeout()
-function validateTimerDuration(msecs, name) {
+function getTimerDuration(msecs, name) {
validateNumber(msecs, name);
if (msecs < 0 || !isFinite(msecs)) {
throw new ERR_OUT_OF_RANGE(name, 'a non-negative finite number', msecs);
@@ -586,7 +586,7 @@ module.exports = {
kRefed,
initAsyncResource,
setUnrefTimeout,
- validateTimerDuration,
+ getTimerDuration,
immediateQueue,
getTimerCallbacks,
immediateInfoFields: {
diff --git a/lib/timers.js b/lib/timers.js
index dff7eb4994..8dc8b8877b 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -36,7 +36,7 @@ const {
},
kRefed,
initAsyncResource,
- validateTimerDuration,
+ getTimerDuration,
timerListMap,
timerListQueue,
immediateQueue,
@@ -102,7 +102,7 @@ function unenroll(item) {
// This function does not start the timer, see `active()`.
// Using existing objects as timers slightly reduces object overhead.
function enroll(item, msecs) {
- msecs = validateTimerDuration(msecs, 'msecs');
+ msecs = getTimerDuration(msecs, 'msecs');
// If this item was already in a list somewhere
// then we should unenroll it from that