Skip to content

Commit 0bdb95f

Browse files
committed
src: move process.binding('signal_wrap') to internalBinding
PR-URL: #22290 Refs: #22160 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: John-David Dalton <john.david.dalton@gmail.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 884b23d commit 0bdb95f

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

lib/internal/bootstrap/node.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
perThreadSetup.setupConfig(NativeModule._source);
6868

6969
if (isMainThread) {
70-
mainThreadSetup.setupSignalHandlers();
70+
mainThreadSetup.setupSignalHandlers(internalBinding);
7171
}
7272

7373
perThreadSetup.setupUncaughtExceptionCapture(exceptionHandlerState,
@@ -349,7 +349,8 @@
349349
'uv',
350350
'http_parser',
351351
'v8',
352-
'stream_wrap']);
352+
'stream_wrap',
353+
'signal_wrap']);
353354
process.binding = function binding(name) {
354355
return internalBindingWhitelist.has(name) ?
355356
internalBinding(name) :

lib/internal/process/main_thread_only.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function setupPosixMethods(_initgroups, _setegid, _seteuid,
117117
}
118118

119119
// Worker threads don't receive signals.
120-
function setupSignalHandlers() {
120+
function setupSignalHandlers(internalBinding) {
121121
const constants = process.binding('constants').os.signals;
122122
const signalWraps = Object.create(null);
123123
let Signal;
@@ -130,7 +130,7 @@ function setupSignalHandlers() {
130130
process.on('newListener', function(type) {
131131
if (isSignal(type) && signalWraps[type] === undefined) {
132132
if (Signal === undefined)
133-
Signal = process.binding('signal_wrap').Signal;
133+
Signal = internalBinding('signal_wrap').Signal;
134134
const wrap = new Signal();
135135

136136
wrap.unref();

src/signal_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ class SignalWrap : public HandleWrap {
128128
} // namespace node
129129

130130

131-
NODE_BUILTIN_MODULE_CONTEXT_AWARE(signal_wrap, node::SignalWrap::Initialize)
131+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(signal_wrap, node::SignalWrap::Initialize)

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

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ assert(process.binding('uv'));
1010
assert(process.binding('http_parser'));
1111
assert(process.binding('v8'));
1212
assert(process.binding('stream_wrap'));
13+
assert(process.binding('signal_wrap'));

test/parallel/test-signal-safety.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
// Flags: --expose-internals
12
'use strict';
23
require('../common');
34
const assert = require('assert');
4-
const Signal = process.binding('signal_wrap').Signal;
5+
const { internalBinding } = require('internal/test/binding');
6+
const { Signal } = internalBinding('signal_wrap');
57

68
// Test Signal `this` safety
79
// https://github.com/joyent/node/issues/6690

test/sequential/test-async-wrap-getasyncid.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
2-
// Flags: --expose-gc --expose-internals
2+
// Flags: --expose-gc --expose-internals --no-warnings
33

44
const common = require('../common');
55
const { internalBinding } = require('internal/test/binding');
@@ -187,7 +187,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
187187
}
188188

189189
{
190-
const Signal = process.binding('signal_wrap').Signal;
190+
const { Signal } = internalBinding('signal_wrap');
191191
testInitialized(new Signal(), 'Signal');
192192
}
193193

0 commit comments

Comments
 (0)