src: refactor bootstrap to use bootstrap object

jasnell · targos · commit ba17c9e46b02 · 2018-06-13T08:41:48.000+02:00
PR-URL: #20917 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Backport-PR-URL: #21172
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -10,10 +10,19 @@
 // process.binding(), process._linkedBinding(), internalBinding() and
 // NativeModule. And then{internalBinding, NativeModule } will be passed
 // into this bootstrapper to bootstrap Node.js core.
-
 'use strict';
 
-(function bootstrapNodeJSCore(process,{internalBinding, NativeModule }){
+(function bootstrapNodeJSCore(process,
+ // bootstrapper properties... destructured to
+ // avoid retaining a reference to the bootstrap
+ // object.
+{_setupProcessObject, _setupNextTick,
+ _setupPromises, _chdir, _cpuUsage,
+ _hrtime, _memoryUsage, _rawDebug,
+ _umask, _initgroups, _setegid, _seteuid,
+ _setgid, _setuid, _setgroups,
+ _shouldAbortOnUncaughtToggle },
+{internalBinding, NativeModule }){
 const exceptionHandlerState ={captureFn: null };
 
 function startup(){
@@ -36,11 +45,24 @@
 const _process = NativeModule.require('internal/process');
 _process.setupConfig(NativeModule._source);
 _process.setupSignalHandlers();
- _process.setupUncaughtExceptionCapture(exceptionHandlerState);
+ _process.setupUncaughtExceptionCapture(exceptionHandlerState,
+ _shouldAbortOnUncaughtToggle);
 NativeModule.require('internal/process/warning').setup();
- NativeModule.require('internal/process/next_tick').setup();
+ NativeModule.require('internal/process/next_tick').setup(_setupNextTick,
+ _setupPromises);
 NativeModule.require('internal/process/stdio').setup();
- NativeModule.require('internal/process/methods').setup();
+ NativeModule.require('internal/process/methods').setup(_chdir,
+ _cpuUsage,
+ _hrtime,
+ _memoryUsage,
+ _rawDebug,
+ _umask,
+ _initgroups,
+ _setegid,
+ _seteuid,
+ _setgid,
+ _setuid,
+ _setgroups);
 
 const perf = process.binding('performance');
 const{
@@ -55,9 +77,9 @@
 NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END
 } = perf.constants;
 
- _process.setup_hrtime();
- _process.setup_cpuUsage();
- _process.setupMemoryUsage();
+ _process.setup_hrtime(_hrtime);
+ _process.setup_cpuUsage(_cpuUsage);
+ _process.setupMemoryUsage(_memoryUsage);
 _process.setupKillAndExit();
 if (global.__coverage__)
 NativeModule.require('internal/process/write-coverage').setup();
@@ -79,7 +101,7 @@
 }
 
 _process.setupChannel();
- _process.setupRawDebug();
+ _process.setupRawDebug(_rawDebug);
 
 const browserGlobals = !process._noBrowserGlobals;
 if (browserGlobals){
@@ -294,7 +316,7 @@
 }
 
 function setupProcessObject(){
- process._setupProcessObject(pushValueToArray);
+ _setupProcessObject(pushValueToArray);
 
 function pushValueToArray(){
 for (var i = 0; i < arguments.length; i++)
diff --git a/lib/internal/process.js b/lib/internal/process.js
@@ -25,10 +25,7 @@ process.assert = deprecate(
 'DEP0100');
 
 // Set up the process.cpuUsage() function.
-function setup_cpuUsage(){
- // Get the native function, which will be replaced with a JS version.
- const _cpuUsage = process.cpuUsage;
-
+function setup_cpuUsage(_cpuUsage){
 // Create the argument array that will be passed to the native function.
 const cpuValues = new Float64Array(2);
 
@@ -92,8 +89,7 @@ function setup_cpuUsage(){
 // The 3 entries filled in by the original process.hrtime contains
 // the upper/lower 32 bits of the second part of the value,
 // and the remaining nanoseconds of the value.
-function setup_hrtime(){
- const _hrtime = process.hrtime;
+function setup_hrtime(_hrtime){
 const hrValues = new Uint32Array(3);
 
 process.hrtime = function hrtime(time){
@@ -120,12 +116,11 @@ function setup_hrtime(){
 };
 }
 
-function setupMemoryUsage(){
- const memoryUsage_ = process.memoryUsage;
+function setupMemoryUsage(_memoryUsage){
 const memValues = new Float64Array(4);
 
 process.memoryUsage = function memoryUsage(){
- memoryUsage_(memValues);
+ _memoryUsage(memValues);
 return{
 rss: memValues[0],
 heapTotal: memValues[1],
@@ -245,18 +240,17 @@ function setupChannel(){
 }
 
 
-function setupRawDebug(){
- const rawDebug = process._rawDebug;
+function setupRawDebug(_rawDebug){
 process._rawDebug = function(){
- rawDebug(util.format.apply(null, arguments));
+ _rawDebug(util.format.apply(null, arguments));
 };
 }
 
 
-function setupUncaughtExceptionCapture(exceptionHandlerState){
- // This is a typed array for faster communication with JS.
- const shouldAbortOnUncaughtToggle = process._shouldAbortOnUncaughtToggle;
- delete process._shouldAbortOnUncaughtToggle;
+function setupUncaughtExceptionCapture(exceptionHandlerState,
+ shouldAbortOnUncaughtToggle){
+ // shouldAbortOnUncaughtToggle is a typed array for faster
+ // communication with JS.
 
 process.setUncaughtExceptionCaptureCallback = function(fn){
 if (fn === null){
diff --git a/lib/internal/process/methods.js b/lib/internal/process/methods.js
@@ -1,65 +1,49 @@
 'use strict';
 
-function setupProcessMethods(){
+function setupProcessMethods(_chdir, _cpuUsage, _hrtime, _memoryUsage,
+ _rawDebug, _umask, _initgroups, _setegid,
+ _seteuid, _setgid, _setuid, _setgroups){
 // Non-POSIX platforms like Windows don't have certain methods.
- if (process.setgid !== undefined){
- setupPosixMethods();
+ if (_setgid !== undefined){
+ setupPosixMethods(_initgroups, _setegid, _seteuid,
+ _setgid, _setuid, _setgroups);
 }
 
- const{chdir: _chdir, umask: _umask } = process;
-
- process.chdir = chdir;
- process.umask = umask;
-
- function chdir(...args){
+ process.chdir = function chdir(...args){
 return _chdir(...args);
- }
+ };
 
- function umask(...args){
+ process.umask = function umask(...args){
 return _umask(...args);
- }
+ };
 }
 
-function setupPosixMethods(){
- const{
- initgroups: _initgroups,
- setegid: _setegid,
- seteuid: _seteuid,
- setgid: _setgid,
- setuid: _setuid,
- setgroups: _setgroups
- } = process;
-
- process.initgroups = initgroups;
- process.setegid = setegid;
- process.seteuid = seteuid;
- process.setgid = setgid;
- process.setuid = setuid;
- process.setgroups = setgroups;
+function setupPosixMethods(_initgroups, _setegid, _seteuid,
+ _setgid, _setuid, _setgroups){
 
- function initgroups(...args){
+ process.initgroups = function initgroups(...args){
 return _initgroups(...args);
- }
+ };
 
- function setegid(...args){
+ process.setegid = function setegid(...args){
 return _setegid(...args);
- }
+ };
 
- function seteuid(...args){
+ process.seteuid = function seteuid(...args){
 return _seteuid(...args);
- }
+ };
 
- function setgid(...args){
+ process.setgid = function setgid(...args){
 return _setgid(...args);
- }
+ };
 
- function setuid(...args){
+ process.setuid = function setuid(...args){
 return _setuid(...args);
- }
+ };
 
- function setgroups(...args){
+ process.setgroups = function setgroups(...args){
 return _setgroups(...args);
- }
+ };
 }
 
 exports.setup = setupProcessMethods;
diff --git a/lib/internal/process/next_tick.js b/lib/internal/process/next_tick.js
@@ -2,7 +2,7 @@
 
 exports.setup = setupNextTick;
 
-function setupNextTick(){
+function setupNextTick(_setupNextTick, _setupPromises){
 const{
 getDefaultTriggerAsyncId,
 newAsyncId,
@@ -14,10 +14,10 @@ function setupNextTick(){
 emitDestroy,
 symbols:{async_id_symbol, trigger_async_id_symbol }
 } = require('internal/async_hooks');
- const promises = require('internal/process/promises');
+ const emitPromiseRejectionWarnings =
+ require('internal/process/promises').setup(_setupPromises);
 const{ERR_INVALID_CALLBACK } = require('internal/errors').codes;
 const FixedQueue = require('internal/fixed_queue');
- const{emitPromiseRejectionWarnings } = promises;
 
 // tickInfo is used so that the C++ code in src/node.cc can
 // have easy access to our nextTick state, and avoid unnecessary
@@ -26,7 +26,7 @@ function setupNextTick(){
 const [
 tickInfo,
 runMicrotasks
- ] = process._setupNextTick(_tickCallback);
+ ] = _setupNextTick(_tickCallback);
 
 // *Must* match Environment::TickInfo::Fields in src/env.h.
 const kHasScheduled = 0;
diff --git a/lib/internal/process/promises.js b/lib/internal/process/promises.js
@@ -7,11 +7,12 @@ const pendingUnhandledRejections = [];
 const asyncHandledRejections = [];
 let lastPromiseId = 0;
 
-module.exports ={
- emitPromiseRejectionWarnings
-};
+exports.setup = setupPromises;
 
-process._setupPromises(unhandledRejection, handledRejection);
+function setupPromises(_setupPromises){
+ _setupPromises(unhandledRejection, handledRejection);
+ return emitPromiseRejectionWarnings;
+}
 
 function unhandledRejection(promise, reason){
 maybeUnhandledPromises.set(promise,{
diff --git a/node.gyp b/node.gyp
@@ -308,6 +308,7 @@
 
 'sources': [
 'src/async_wrap.cc',
+ 'src/bootstrapper.cc',
 'src/callback_scope.cc',
 'src/cares_wrap.cc',
 'src/connection_wrap.cc',
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
diff --git a/src/node.cc b/src/node.cc
diff --git a/src/node_internals.h b/src/node_internals.h

-Original file line number
+Diff line change
 'DEP0100');
 // Set up the process.cpuUsage() function.
 -functionsetup_cpuUsage(){
 -// Get the native function, which will be replaced with a JS version.
 -const_cpuUsage=process.cpuUsage;
+-
 +functionsetup_cpuUsage(_cpuUsage){
 // Create the argument array that will be passed to the native function.
 constcpuValues=newFloat64Array(2);
 // The 3 entries filled in by the original process.hrtime contains
 // the upper/lower 32 bits of the second part of the value,
 // and the remaining nanoseconds of the value.
 -functionsetup_hrtime(){
 -const_hrtime=process.hrtime;
 +functionsetup_hrtime(_hrtime){
 consthrValues=newUint32Array(3);
 process.hrtime=functionhrtime(time){
 };
+}
 -functionsetupMemoryUsage(){
 -constmemoryUsage_=process.memoryUsage;
 +functionsetupMemoryUsage(_memoryUsage){
 constmemValues=newFloat64Array(4);
 process.memoryUsage=functionmemoryUsage(){
 -memoryUsage_(memValues);
 +_memoryUsage(memValues);
 return{
 rss: memValues[0],
 heapTotal: memValues[1],
+}
 -functionsetupRawDebug(){
 -constrawDebug=process._rawDebug;
 +functionsetupRawDebug(_rawDebug){
 process._rawDebug=function(){
 -rawDebug(util.format.apply(null,arguments));
 +_rawDebug(util.format.apply(null,arguments));
 };
+}
 -functionsetupUncaughtExceptionCapture(exceptionHandlerState){
 -// This is a typed array for faster communication with JS.
 -constshouldAbortOnUncaughtToggle=process._shouldAbortOnUncaughtToggle;
 -deleteprocess._shouldAbortOnUncaughtToggle;
 +functionsetupUncaughtExceptionCapture(exceptionHandlerState,
 +shouldAbortOnUncaughtToggle){
 +// shouldAbortOnUncaughtToggle is a typed array for faster
 +// communication with JS.
 process.setUncaughtExceptionCaptureCallback=function(fn){
 if(fn===null){
-Original file line number
+Diff line change
@@ @@ -1,65 +1,49 @@ @@
 'use strict';
 -functionsetupProcessMethods(){
 +functionsetupProcessMethods(_chdir,_cpuUsage,_hrtime,_memoryUsage,
 +_rawDebug,_umask,_initgroups,_setegid,
 +_seteuid,_setgid,_setuid,_setgroups){
 // Non-POSIX platforms like Windows don't have certain methods.
 -if(process.setgid!==undefined){
 -setupPosixMethods();
 +if(_setgid!==undefined){
 +setupPosixMethods(_initgroups,_setegid,_seteuid,
 +_setgid,_setuid,_setgroups);
+}
 -const{chdir: _chdir,umask: _umask}=process;
+-
 -process.chdir=chdir;
 -process.umask=umask;
+-
 -functionchdir(...args){
 +process.chdir=functionchdir(...args){
 return_chdir(...args);
 -}
 +};
 -functionumask(...args){
 +process.umask=functionumask(...args){
 return_umask(...args);
 -}
 +};
+}
 -functionsetupPosixMethods(){
 -const{
 -initgroups: _initgroups,
 -setegid: _setegid,
 -seteuid: _seteuid,
 -setgid: _setgid,
 -setuid: _setuid,
 -setgroups: _setgroups
 -}=process;
+-
 -process.initgroups=initgroups;
 -process.setegid=setegid;
 -process.seteuid=seteuid;
 -process.setgid=setgid;
 -process.setuid=setuid;
 -process.setgroups=setgroups;
 +functionsetupPosixMethods(_initgroups,_setegid,_seteuid,
 +_setgid,_setuid,_setgroups){
 -functioninitgroups(...args){
 +process.initgroups=functioninitgroups(...args){
 return_initgroups(...args);
 -}
 +};
 -functionsetegid(...args){
 +process.setegid=functionsetegid(...args){
 return_setegid(...args);
 -}
 +};
 -functionseteuid(...args){
 +process.seteuid=functionseteuid(...args){
 return_seteuid(...args);
 -}
 +};
 -functionsetgid(...args){
 +process.setgid=functionsetgid(...args){
 return_setgid(...args);
 -}
 +};
 -functionsetuid(...args){
 +process.setuid=functionsetuid(...args){
 return_setuid(...args);
 -}
 +};
 -functionsetgroups(...args){
 +process.setgroups=functionsetgroups(...args){
 return_setgroups(...args);
 -}
 +};
+}
 exports.setup=setupProcessMethods;
-Original file line number
+Diff line change
 exports.setup=setupNextTick;
 -functionsetupNextTick(){
 +functionsetupNextTick(_setupNextTick,_setupPromises){
 const{
  getDefaultTriggerAsyncId,
  newAsyncId,
  emitDestroy,
 symbols: { async_id_symbol, trigger_async_id_symbol }
 }=require('internal/async_hooks');
 -constpromises=require('internal/process/promises');
 +constemitPromiseRejectionWarnings=
 +require('internal/process/promises').setup(_setupPromises);
 const{ERR_INVALID_CALLBACK}=require('internal/errors').codes;
 constFixedQueue=require('internal/fixed_queue');
 -const{ emitPromiseRejectionWarnings }=promises;
 // tickInfo is used so that the C++ code in src/node.cc can
 // have easy access to our nextTick state, and avoid unnecessary
 const[
 tickInfo,
 runMicrotasks
 -]=process._setupNextTick(_tickCallback);
 +]=_setupNextTick(_tickCallback);
 // *Must* match Environment::TickInfo::Fields in src/env.h.
 constkHasScheduled=0;
-Original file line number
+Diff line change
 constasyncHandledRejections=[];
 letlastPromiseId=0;
 -module.exports={
 - emitPromiseRejectionWarnings
 -};
 +exports.setup=setupPromises;
 -process._setupPromises(unhandledRejection,handledRejection);
 +functionsetupPromises(_setupPromises){
 +_setupPromises(unhandledRejection,handledRejection);
 +returnemitPromiseRejectionWarnings;
 +}
 functionunhandledRejection(promise,reason){
 maybeUnhandledPromises.set(promise,{