Skip to content

Commit 5d95542

Browse files
starkwangjasnell
authored andcommittedOct 17, 2018
buffer: move process.binding('buffer') to internalBinding
PR-URL: #22370 Refs: #22160 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent e806167 commit 5d95542

21 files changed

+46
-22
lines changed
 

‎lib/buffer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const {
3636
swap64: _swap64,
3737
kMaxLength,
3838
kStringMaxLength
39-
} = process.binding('buffer');
39+
} = internalBinding('buffer');
4040
const { isAnyArrayBuffer } = internalBinding('types');
4141
const {
4242
customInspectSymbol,

‎lib/internal/bootstrap/node.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,8 @@
413413
'url',
414414
'spawn_sync',
415415
'js_stream',
416-
'zlib']);
416+
'zlib',
417+
'buffer']);
417418
process.binding = function binding(name) {
418419
return internalBindingWhitelist.has(name) ?
419420
internalBinding(name) :

‎lib/internal/buffer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const binding = process.binding('buffer');
3+
const binding = internalBinding('buffer');
44
const {
55
ERR_BUFFER_OUT_OF_BOUNDS,
66
ERR_INVALID_ARG_TYPE,

‎lib/internal/encoding.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const {
2929

3030
const {
3131
encodeUtf8String
32-
} = process.binding('buffer');
32+
} = internalBinding('buffer');
3333

3434
var Buffer;
3535
function lazyBuffer() {

‎lib/internal/errors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const {
2020
UV_EAI_NODATA,
2121
UV_EAI_NONAME
2222
} = internalBinding('uv');
23-
const { kMaxLength } = process.binding('buffer');
23+
const { kMaxLength } = internalBinding('buffer');
2424
const { defineProperty } = Object;
2525

2626
// Lazily loaded

‎lib/internal/util/comparisons.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const { compare } = process.binding('buffer');
3+
const { compare } = internalBinding('buffer');
44
const { isArrayBufferView } = require('internal/util/types');
55
const {
66
isAnyArrayBuffer,

‎lib/v8.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const {
2020
Serializer: _Serializer,
2121
Deserializer: _Deserializer
2222
} = internalBinding('serdes');
23-
const { copy } = process.binding('buffer');
23+
const { copy } = internalBinding('buffer');
2424
const { objectToString } = require('internal/util');
2525
const { FastBuffer } = require('internal/buffer');
2626

‎src/node_buffer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1104,4 +1104,4 @@ void Initialize(Local<Object> target,
11041104
} // namespace Buffer
11051105
} // namespace node
11061106

1107-
NODE_BUILTIN_MODULE_CONTEXT_AWARE(buffer, node::Buffer::Initialize)
1107+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(buffer, node::Buffer::Initialize)

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -10,7 +12,7 @@ const assert = require('assert');
1012

1113
// v8 fails silently if string length > v8::String::kMaxLength
1214
// v8::String::kMaxLength defined in v8.h
13-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
15+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1416

1517
let buf;
1618
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -9,7 +11,7 @@ const binding = require(`./build/${common.buildType}/binding`);
911

1012
// v8 fails silently if string length > v8::String::kMaxLength
1113
// v8::String::kMaxLength defined in v8.h
12-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
14+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1315

1416
let buf;
1517
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -9,7 +11,7 @@ const binding = require(`./build/${common.buildType}/binding`);
911

1012
// v8 fails silently if string length > v8::String::kMaxLength
1113
// v8::String::kMaxLength defined in v8.h
12-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
14+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1315

1416
let buf;
1517
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
// Flags: --expose-gc
1+
// Flags: --expose-gc --expose-internals
22
'use strict';
33

44
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
56
const skipMessage = 'intensive toString tests due to memory confinements';
67
if (!common.enoughTestMem)
78
common.skip(skipMessage);
@@ -11,7 +12,7 @@ const assert = require('assert');
1112

1213
// v8 fails silently if string length > v8::String::kMaxLength
1314
// v8::String::kMaxLength defined in v8.h
14-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
15+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1516

1617
let buf;
1718
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -9,7 +11,7 @@ const binding = require(`./build/${common.buildType}/binding`);
911

1012
// v8 fails silently if string length > v8::String::kMaxLength
1113
// v8::String::kMaxLength defined in v8.h
12-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
14+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1315

1416
let buf;
1517
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -10,7 +12,7 @@ const assert = require('assert');
1012

1113
// v8 fails silently if string length > v8::String::kMaxLength
1214
// v8::String::kMaxLength defined in v8.h
13-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
15+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1416

1517
let buf;
1618
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -10,7 +12,7 @@ const assert = require('assert');
1012

1113
// v8 fails silently if string length > v8::String::kMaxLength
1214
// v8::String::kMaxLength defined in v8.h
13-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
15+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1416

1517
let buf;
1618
try {

‎test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../../common');
5+
const { internalBinding } = require('internal/test/binding');
46
const skipMessage = 'intensive toString tests due to memory confinements';
57
if (!common.enoughTestMem)
68
common.skip(skipMessage);
@@ -9,7 +11,7 @@ const binding = require(`./build/${common.buildType}/binding`);
911

1012
// v8 fails silently if string length > v8::String::kMaxLength
1113
// v8::String::kMaxLength defined in v8.h
12-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
14+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1315

1416
let buf;
1517
try {

‎test/parallel/test-buffer-fill.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const common = require('../common');
44
const assert = require('assert');
55
const { codes: { ERR_OUT_OF_RANGE } } = require('internal/errors');
6+
const { internalBinding } = require('internal/test/binding');
67
const SIZE = 28;
78

89
const buf1 = Buffer.allocUnsafe(SIZE);
@@ -327,7 +328,7 @@ Buffer.alloc(8, '');
327328
// Testing process.binding. Make sure "start" is properly checked for -1 wrap
328329
// around.
329330
assert.strictEqual(
330-
process.binding('buffer').fill(Buffer.alloc(1), 1, -1, 0, 1), -2);
331+
internalBinding('buffer').fill(Buffer.alloc(1), 1, -1, 0, 1), -2);
331332

332333
// Make sure "end" is properly checked, even if it's magically mangled using
333334
// Symbol.toPrimitive.
@@ -365,7 +366,7 @@ assert.strictEqual(
365366
// Testing process.binding. Make sure "end" is properly checked for -1 wrap
366367
// around.
367368
assert.strictEqual(
368-
process.binding('buffer').fill(Buffer.alloc(1), 1, 1, -2, 1), -2);
369+
internalBinding('buffer').fill(Buffer.alloc(1), 1, 1, -2, 1), -2);
369370

370371
// Test that bypassing 'length' won't cause an abort.
371372
common.expectsError(() => {

‎test/parallel/test-internal-errors.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const {
55
hijackStdout,
66
restoreStdout,
77
} = require('../common/hijackstdio');
8+
9+
const { internalBinding } = require('internal/test/binding');
810
const assert = require('assert');
911
const errors = require('internal/errors');
1012

@@ -183,7 +185,7 @@ assert.strictEqual(
183185
'Invalid asyncId value: undefined');
184186

185187
{
186-
const { kMaxLength } = process.binding('buffer');
188+
const { kMaxLength } = internalBinding('buffer');
187189
const error = new errors.codes.ERR_BUFFER_TOO_LARGE();
188190
assert.strictEqual(
189191
error.message,

‎test/parallel/test-process-binding-internalbinding-whitelist.js

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ assert(process.binding('contextify'));
1515
assert(process.binding('url'));
1616
assert(process.binding('spawn_sync'));
1717
assert(process.binding('js_stream'));
18+
assert(process.binding('buffer'));

‎test/parallel/test-process-binding.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23
require('../common');
34
const assert = require('assert');
5+
const { internalBinding } = require('internal/test/binding');
46

57
assert.throws(
68
function() {
@@ -9,4 +11,4 @@ assert.throws(
911
/No such module: test/
1012
);
1113

12-
process.binding('buffer');
14+
internalBinding('buffer');

‎test/sequential/test-fs-readfile-tostring-fail.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
2+
// Flags: --expose-internals
23

34
const common = require('../common');
5+
const { internalBinding } = require('internal/test/binding');
46

57
if (!common.enoughTestMem)
68
common.skip('intensive toString tests due to memory confinements');
@@ -9,7 +11,7 @@ const assert = require('assert');
911
const fs = require('fs');
1012
const path = require('path');
1113
const cp = require('child_process');
12-
const kStringMaxLength = process.binding('buffer').kStringMaxLength;
14+
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
1315
if (common.isAIX && (Number(cp.execSync('ulimit -f')) * 512) < kStringMaxLength)
1416
common.skip('intensive toString tests due to file size confinements');
1517

0 commit comments

Comments
 (0)