Skip to content

Commit 1c3486a

Browse files
jasnelljasnell
committed
src: refactor bootstrap to use bootstrap object
1 parent 8fac1d9 commit 1c3486a

10 files changed

Lines changed: 245 additions & 200 deletions

File tree

‎lib/internal/bootstrap/node.js‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@
1010
// process.binding(), process._linkedBinding(), internalBinding() and
1111
// NativeModule. And then { internalBinding, NativeModule } will be passed
1212
// into this bootstrapper to bootstrap Node.js core.
13-
1413
'use strict';
1514

16-
(function bootstrapNodeJSCore(process, { internalBinding, NativeModule }) {
15+
(function bootstrapNodeJSCore(process,
16+
// bootstrapper properties... destructured to
17+
// avoid retaining a reference to the bootstrap
18+
// object.
19+
{ _setupProcessObject, _setupNextTick,
20+
_setupPromises, _chdir, _cpuUsage,
21+
_hrtime, _memoryUsage, _rawDebug,
22+
_umask, _initgroups, _setegid, _seteuid,
23+
_setgid, _setuid, _setgroups,
24+
_shouldAbortOnUncaughtToggle },
25+
{ internalBinding, NativeModule }) {
1726
const exceptionHandlerState = { captureFn: null };
1827

1928
function startup() {
@@ -36,11 +45,24 @@
3645
const _process = NativeModule.require('internal/process');
3746
_process.setupConfig(NativeModule._source);
3847
_process.setupSignalHandlers();
39-
_process.setupUncaughtExceptionCapture(exceptionHandlerState);
48+
_process.setupUncaughtExceptionCapture(exceptionHandlerState,
49+
_shouldAbortOnUncaughtToggle);
4050
NativeModule.require('internal/process/warning').setup();
41-
NativeModule.require('internal/process/next_tick').setup();
51+
NativeModule.require('internal/process/next_tick').setup(_setupNextTick,
52+
_setupPromises);
4253
NativeModule.require('internal/process/stdio').setup();
43-
NativeModule.require('internal/process/methods').setup();
54+
NativeModule.require('internal/process/methods').setup(_chdir,
55+
_cpuUsage,
56+
_hrtime,
57+
_memoryUsage,
58+
_rawDebug,
59+
_umask,
60+
_initgroups,
61+
_setegid,
62+
_seteuid,
63+
_setgid,
64+
_setuid,
65+
_setgroups);
4466

4567
const perf = process.binding('performance');
4668
const {
@@ -55,9 +77,9 @@
5577
NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END
5678
} = perf.constants;
5779

58-
_process.setup_hrtime();
59-
_process.setup_cpuUsage();
60-
_process.setupMemoryUsage();
80+
_process.setup_hrtime(_hrtime);
81+
_process.setup_cpuUsage(_cpuUsage);
82+
_process.setupMemoryUsage(_memoryUsage);
6183
_process.setupKillAndExit();
6284
if (global.__coverage__)
6385
NativeModule.require('internal/process/write-coverage').setup();
@@ -79,7 +101,7 @@
79101
}
80102

81103
_process.setupChannel();
82-
_process.setupRawDebug();
104+
_process.setupRawDebug(_rawDebug);
83105

84106
const browserGlobals = !process._noBrowserGlobals;
85107
if (browserGlobals) {
@@ -294,7 +316,7 @@
294316
}
295317

296318
function setupProcessObject() {
297-
process._setupProcessObject(pushValueToArray);
319+
_setupProcessObject(pushValueToArray);
298320

299321
function pushValueToArray() {
300322
for (var i = 0; i < arguments.length; i++)

‎lib/internal/process.js‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ process.assert = deprecate(
2525
'DEP0100');
2626

2727
// Set up the process.cpuUsage() function.
28-
function setup_cpuUsage() {
29-
// Get the native function, which will be replaced with a JS version.
30-
const _cpuUsage = process.cpuUsage;
31-
28+
function setup_cpuUsage(_cpuUsage) {
3229
// Create the argument array that will be passed to the native function.
3330
const cpuValues = new Float64Array(2);
3431

@@ -92,8 +89,7 @@ function setup_cpuUsage() {
9289
// The 3 entries filled in by the original process.hrtime contains
9390
// the upper/lower 32 bits of the second part of the value,
9491
// and the remaining nanoseconds of the value.
95-
function setup_hrtime() {
96-
const _hrtime = process.hrtime;
92+
function setup_hrtime(_hrtime) {
9793
const hrValues = new Uint32Array(3);
9894

9995
process.hrtime = function hrtime(time) {
@@ -120,12 +116,11 @@ function setup_hrtime() {
120116
};
121117
}
122118

123-
function setupMemoryUsage() {
124-
const memoryUsage_ = process.memoryUsage;
119+
function setupMemoryUsage(_memoryUsage) {
125120
const memValues = new Float64Array(4);
126121

127122
process.memoryUsage = function memoryUsage() {
128-
memoryUsage_(memValues);
123+
_memoryUsage(memValues);
129124
return {
130125
rss: memValues[0],
131126
heapTotal: memValues[1],
@@ -245,18 +240,17 @@ function setupChannel() {
245240
}
246241

247242

248-
function setupRawDebug() {
249-
const rawDebug = process._rawDebug;
243+
function setupRawDebug(_rawDebug) {
250244
process._rawDebug = function() {
251-
rawDebug(util.format.apply(null, arguments));
245+
_rawDebug(util.format.apply(null, arguments));
252246
};
253247
}
254248

255249

256-
function setupUncaughtExceptionCapture(exceptionHandlerState) {
257-
// This is a typed array for faster communication with JS.
258-
const shouldAbortOnUncaughtToggle = process._shouldAbortOnUncaughtToggle;
259-
delete process._shouldAbortOnUncaughtToggle;
250+
function setupUncaughtExceptionCapture(exceptionHandlerState,
251+
shouldAbortOnUncaughtToggle) {
252+
// shouldAbortOnUncaughtToggle is a typed array for faster
253+
// communication with JS.
260254

261255
process.setUncaughtExceptionCaptureCallback = function(fn) {
262256
if (fn === null) {

‎lib/internal/process/methods.js‎

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,36 @@ const {
99
validateUint32
1010
} = require('internal/validators');
1111

12-
function setupProcessMethods() {
12+
function setupProcessMethods(_chdir, _cpuUsage, _hrtime, _memoryUsage,
13+
_rawDebug, _umask, _initgroups, _setegid,
14+
_seteuid, _setgid, _setuid, _setgroups) {
1315
// Non-POSIX platforms like Windows don't have certain methods.
14-
if (process.setgid !== undefined) {
15-
setupPosixMethods();
16+
if (_setgid !== undefined) {
17+
setupPosixMethods(_initgroups, _setegid, _seteuid,
18+
_setgid, _setuid, _setgroups);
1619
}
1720

18-
const {
19-
chdir: _chdir,
20-
umask: _umask,
21-
} = process;
22-
23-
process.chdir = chdir;
24-
process.umask = umask;
25-
26-
function chdir(directory) {
21+
process.chdir = function chdir(directory) {
2722
if (typeof directory !== 'string') {
2823
throw new ERR_INVALID_ARG_TYPE('directory', 'string', directory);
2924
}
3025
return _chdir(directory);
31-
}
26+
};
3227

33-
function umask(mask) {
28+
process.umask = function umask(mask) {
3429
if (mask === undefined) {
3530
// Get the mask
3631
return _umask(mask);
3732
}
3833
mask = validateAndMaskMode(mask, 'mask');
3934
return _umask(mask);
40-
}
35+
};
4136
}
4237

43-
function setupPosixMethods() {
44-
const {
45-
initgroups: _initgroups,
46-
setegid: _setegid,
47-
seteuid: _seteuid,
48-
setgid: _setgid,
49-
setuid: _setuid,
50-
setgroups: _setgroups
51-
} = process;
52-
53-
process.initgroups = initgroups;
54-
process.setegid = setegid;
55-
process.seteuid = seteuid;
56-
process.setgid = setgid;
57-
process.setuid = setuid;
58-
process.setgroups = setgroups;
38+
function setupPosixMethods(_initgroups, _setegid, _seteuid,
39+
_setgid, _setuid, _setgroups) {
5940

60-
function initgroups(user, extraGroup) {
41+
process.initgroups = function initgroups(user, extraGroup) {
6142
validateId(user, 'user');
6243
validateId(extraGroup, 'extraGroup');
6344
// Result is 0 on success, 1 if user is unknown, 2 if group is unknown.
@@ -67,25 +48,25 @@ function setupPosixMethods() {
6748
} else if (result === 2) {
6849
throw new ERR_UNKNOWN_CREDENTIAL('Group', extraGroup);
6950
}
70-
}
51+
};
7152

72-
function setegid(id) {
53+
process.setegid = function setegid(id) {
7354
return execId(id, 'Group', _setegid);
74-
}
55+
};
7556

76-
function seteuid(id) {
57+
process.seteuid = function seteuid(id) {
7758
return execId(id, 'User', _seteuid);
78-
}
59+
};
7960

80-
function setgid(id) {
61+
process.setgid = function setgid(id) {
8162
return execId(id, 'Group', _setgid);
82-
}
63+
};
8364

84-
function setuid(id) {
65+
process.setuid = function setuid(id) {
8566
return execId(id, 'User', _setuid);
86-
}
67+
};
8768

88-
function setgroups(groups) {
69+
process.setgroups = function setgroups(groups) {
8970
if (!Array.isArray(groups)) {
9071
throw new ERR_INVALID_ARG_TYPE('groups', 'Array', groups);
9172
}
@@ -98,7 +79,7 @@ function setupPosixMethods() {
9879
if (result > 0) {
9980
throw new ERR_UNKNOWN_CREDENTIAL('Group', groups[result - 1]);
10081
}
101-
}
82+
};
10283

10384
function execId(id, type, method) {
10485
validateId(id, 'id');

‎lib/internal/process/next_tick.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports.setup = setupNextTick;
44

5-
function setupNextTick() {
5+
function setupNextTick(_setupNextTick, _setupPromises) {
66
const {
77
getDefaultTriggerAsyncId,
88
newAsyncId,
@@ -14,10 +14,10 @@ function setupNextTick() {
1414
emitDestroy,
1515
symbols: { async_id_symbol, trigger_async_id_symbol }
1616
} = require('internal/async_hooks');
17-
const promises = require('internal/process/promises');
17+
const emitPromiseRejectionWarnings =
18+
require('internal/process/promises').setup(_setupPromises);
1819
const { ERR_INVALID_CALLBACK } = require('internal/errors').codes;
1920
const FixedQueue = require('internal/fixed_queue');
20-
const { emitPromiseRejectionWarnings } = promises;
2121

2222
// tickInfo is used so that the C++ code in src/node.cc can
2323
// have easy access to our nextTick state, and avoid unnecessary
@@ -26,7 +26,7 @@ function setupNextTick() {
2626
const [
2727
tickInfo,
2828
runMicrotasks
29-
] = process._setupNextTick(_tickCallback);
29+
] = _setupNextTick(_tickCallback);
3030

3131
// *Must* match Environment::TickInfo::Fields in src/env.h.
3232
const kHasScheduled = 0;

‎lib/internal/process/promises.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ const pendingUnhandledRejections = [];
77
const asyncHandledRejections = [];
88
let lastPromiseId = 0;
99

10-
module.exports = {
11-
emitPromiseRejectionWarnings
12-
};
10+
exports.setup = setupPromises;
1311

14-
process._setupPromises(unhandledRejection, handledRejection);
12+
function setupPromises(_setupPromises) {
13+
_setupPromises(unhandledRejection, handledRejection);
14+
return emitPromiseRejectionWarnings;
15+
}
1516

1617
function unhandledRejection(promise, reason) {
1718
maybeUnhandledPromises.set(promise, {

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309

310310
'sources': [
311311
'src/async_wrap.cc',
312+
'src/bootstrapper.cc',
312313
'src/callback_scope.cc',
313314
'src/cares_wrap.cc',
314315
'src/connection_wrap.cc',

0 commit comments

Comments
 (0)