summaryrefslogtreecommitdiff
path: root/lib/internal
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2018-10-15 01:41:32 +0200
committerAnna Henningsen <anna@addaleax.net>2018-10-21 03:17:12 +0200
commit87b808f7611b5ed17164f939760f562d5af9fdb4 (patch)
tree2462cb1b292756df8f844891eeddd75edd81a084 /lib/internal
parent20282b1cb0389553421c4c5b14de198c5dfff50b (diff)
downloadandroid-node-v8-87b808f7611b5ed17164f939760f562d5af9fdb4.tar.gz
android-node-v8-87b808f7611b5ed17164f939760f562d5af9fdb4.tar.bz2
android-node-v8-87b808f7611b5ed17164f939760f562d5af9fdb4.zip
src,lib: move `natives` and `constants` to `internalBinding()`
Refs: https://github.com/nodejs/node/issues/22160 PR-URL: https://github.com/nodejs/node/pull/23663 Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Weijia Wang <starkwang@126.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'lib/internal')
-rw-r--r--lib/internal/bootstrap/loaders.js6
-rw-r--r--lib/internal/bootstrap/node.js4
-rw-r--r--lib/internal/crypto/cipher.js2
-rw-r--r--lib/internal/crypto/diffiehellman.js2
-rw-r--r--lib/internal/crypto/sig.js2
-rw-r--r--lib/internal/crypto/util.js2
-rw-r--r--lib/internal/fs/promises.js2
-rw-r--r--lib/internal/fs/utils.js2
-rw-r--r--lib/internal/process/main_thread_only.js2
-rw-r--r--lib/internal/process/per_thread.js2
-rw-r--r--lib/internal/util.js2
-rw-r--r--lib/internal/v8_prof_processor.js2
12 files changed, 16 insertions, 14 deletions
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
index b3072a0294..dff6ce661a 100644
--- a/lib/internal/bootstrap/loaders.js
+++ b/lib/internal/bootstrap/loaders.js
@@ -123,7 +123,7 @@
this.script = null; // The ContextifyScript of the module
}
- NativeModule._source = getBinding('natives');
+ NativeModule._source = getInternalBinding('natives');
NativeModule._cache = {};
const config = getBinding('config');
@@ -256,12 +256,12 @@
// 1. `internalBinding('code_cache_hash')` must be in sync with
// `internalBinding('code_cache')` (same C++ file)
// 2. `internalBinding('natives_hash')` must be in sync with
- // `process.binding('natives')` (same C++ file)
+ // `internalBinding('natives')` (same C++ file)
// 3. If `internalBinding('natives_hash')` is in sync with
// `internalBinding('natives_hash')`, then the (unwrapped)
// code used to generate `internalBinding('code_cache')`
// should be in sync with the (unwrapped) code in
- // `process.binding('natives')`
+ // `internalBinding('natives')`
// There will be, however, false positives if the wrapper used
// to generate the cache is different from the one used at run time,
// and the length of the wrapper somehow stays the same.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index f53ed55dca..f0ca57afd4 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -414,7 +414,9 @@
'spawn_sync',
'js_stream',
'zlib',
- 'buffer']);
+ 'buffer',
+ 'natives',
+ 'constants']);
process.binding = function binding(name) {
return internalBindingWhitelist.has(name) ?
internalBinding(name) :
diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
index 2d7ddede57..a2e973ed84 100644
--- a/lib/internal/crypto/cipher.js
+++ b/lib/internal/crypto/cipher.js
@@ -3,7 +3,7 @@
const {
RSA_PKCS1_OAEP_PADDING,
RSA_PKCS1_PADDING
-} = process.binding('constants').crypto;
+} = internalBinding('constants').crypto;
const {
ERR_CRYPTO_INVALID_STATE,
diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
index 02142d4b1f..4f5bcbad97 100644
--- a/lib/internal/crypto/diffiehellman.js
+++ b/lib/internal/crypto/diffiehellman.js
@@ -24,7 +24,7 @@ const {
POINT_CONVERSION_COMPRESSED,
POINT_CONVERSION_HYBRID,
POINT_CONVERSION_UNCOMPRESSED
-} = process.binding('constants').crypto;
+} = internalBinding('constants').crypto;
const DH_GENERATOR = 2;
diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js
index 86b43341bd..43033345af 100644
--- a/lib/internal/crypto/sig.js
+++ b/lib/internal/crypto/sig.js
@@ -9,7 +9,7 @@ const { Sign: _Sign, Verify: _Verify } = internalBinding('crypto');
const {
RSA_PSS_SALTLEN_AUTO,
RSA_PKCS1_PADDING
-} = process.binding('constants').crypto;
+} = internalBinding('constants').crypto;
const {
getDefaultEncoding,
kHandle,
diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
index 496f195c73..ff5bfce4a7 100644
--- a/lib/internal/crypto/util.js
+++ b/lib/internal/crypto/util.js
@@ -10,7 +10,7 @@ const {
const {
ENGINE_METHOD_ALL
-} = process.binding('constants').crypto;
+} = internalBinding('constants').crypto;
const {
ERR_CRYPTO_ENGINE_UNKNOWN,
diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
index 6cae7d1a21..0fecb20623 100644
--- a/lib/internal/fs/promises.js
+++ b/lib/internal/fs/promises.js
@@ -6,7 +6,7 @@ const {
O_WRONLY,
S_IFMT,
S_IFREG
-} = process.binding('constants').fs;
+} = internalBinding('constants').fs;
const binding = process.binding('fs');
const { Buffer, kMaxLength } = require('buffer');
const {
diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
index c614cb4880..0df13354ac 100644
--- a/lib/internal/fs/utils.js
+++ b/lib/internal/fs/utils.js
@@ -43,7 +43,7 @@ const {
UV_DIRENT_SOCKET,
UV_DIRENT_CHAR,
UV_DIRENT_BLOCK
-} = process.binding('constants').fs;
+} = internalBinding('constants').fs;
const isWindows = process.platform === 'win32';
diff --git a/lib/internal/process/main_thread_only.js b/lib/internal/process/main_thread_only.js
index 49910fafd7..b8e518f6a1 100644
--- a/lib/internal/process/main_thread_only.js
+++ b/lib/internal/process/main_thread_only.js
@@ -118,7 +118,7 @@ function setupPosixMethods(_initgroups, _setegid, _seteuid,
// Worker threads don't receive signals.
function setupSignalHandlers(internalBinding) {
- const constants = process.binding('constants').os.signals;
+ const constants = internalBinding('constants').os.signals;
const signalWraps = Object.create(null);
let Signal;
diff --git a/lib/internal/process/per_thread.js b/lib/internal/process/per_thread.js
index 9397ce3f59..fa3421a3a3 100644
--- a/lib/internal/process/per_thread.js
+++ b/lib/internal/process/per_thread.js
@@ -17,7 +17,7 @@ const {
}
} = require('internal/errors');
const util = require('util');
-const constants = process.binding('constants').os.signals;
+const constants = internalBinding('constants').os.signals;
const { deprecate } = require('internal/util');
function setupAssert() {
diff --git a/lib/internal/util.js b/lib/internal/util.js
index 745b69381d..3524b9e1d6 100644
--- a/lib/internal/util.js
+++ b/lib/internal/util.js
@@ -5,7 +5,7 @@ const {
ERR_NO_CRYPTO,
ERR_UNKNOWN_SIGNAL
} = require('internal/errors').codes;
-const { signals } = process.binding('constants').os;
+const { signals } = internalBinding('constants').os;
const {
getHiddenValue,
setHiddenValue,
diff --git a/lib/internal/v8_prof_processor.js b/lib/internal/v8_prof_processor.js
index 6c7a4db664..572b8074c4 100644
--- a/lib/internal/v8_prof_processor.js
+++ b/lib/internal/v8_prof_processor.js
@@ -19,7 +19,7 @@ const scriptFiles = [
var script = '';
scriptFiles.forEach(function(s) {
- script += process.binding('natives')[s] + '\n';
+ script += internalBinding('natives')[s] + '\n';
});
const tickArguments = [];